Merge pull request #3174 from amet/smc

author Martijn Kaijser <machine.sanctum@gmail.com>

Sun, 1 Sep 2013 22:14:57 +0000 (15:14 -0700)

committer Martijn Kaijser <machine.sanctum@gmail.com>

Sun, 1 Sep 2013 22:14:57 +0000 (15:14 -0700)
author Martijn Kaijser <machine.sanctum@gmail.com>
Sun, 1 Sep 2013 22:14:57 +0000 (15:14 -0700)
committer Martijn Kaijser <machine.sanctum@gmail.com>
Sun, 1 Sep 2013 22:14:57 +0000 (15:14 -0700)
diff --cc XBMC.xcodeproj/project.pbxproj
Simple merge
diff --cc xbmc/GUIInfoManager.cpp
Simple merge
author	Martijn Kaijser <machine.sanctum@gmail.com>
	Sun, 1 Sep 2013 22:14:57 +0000 (15:14 -0700)
committer	Martijn Kaijser <machine.sanctum@gmail.com>
	Sun, 1 Sep 2013 22:14:57 +0000 (15:14 -0700)
		1	2
XBMC.xcodeproj/project.pbxproj	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/GUIInfoManager.cpp	patch \|	diff1 \|	diff2 \|	blob \| history