Merge pull request #4314 from MartijnKaijser/beta1

author Trent Nelson <trent.a.b.nelson@gmail.com>

Mon, 3 Mar 2014 20:11:24 +0000 (15:11 -0500)

committer Trent Nelson <trent.a.b.nelson@gmail.com>

Mon, 3 Mar 2014 20:11:24 +0000 (15:11 -0500)
author Trent Nelson <trent.a.b.nelson@gmail.com>
Mon, 3 Mar 2014 20:11:24 +0000 (15:11 -0500)
committer Trent Nelson <trent.a.b.nelson@gmail.com>
Mon, 3 Mar 2014 20:11:24 +0000 (15:11 -0500)
diff --cc configure.in
Simple merge
diff --cc tools/android/packaging/xbmc/AndroidManifest.xml
Simple merge
diff --cc tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
Simple merge
author	Trent Nelson <trent.a.b.nelson@gmail.com>
	Mon, 3 Mar 2014 20:11:24 +0000 (15:11 -0500)
committer	Trent Nelson <trent.a.b.nelson@gmail.com>
	Mon, 3 Mar 2014 20:11:24 +0000 (15:11 -0500)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
tools/android/packaging/xbmc/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh	patch \|	diff1 \|	diff2 \|	blob \| history