Merge pull request #2846 from Montellese/multi_language_addons

author Sascha Montellese <sascha.montellese@gmail.com>

Mon, 8 Jul 2013 22:02:51 +0000 (15:02 -0700)

committer Sascha Montellese <sascha.montellese@gmail.com>

Mon, 8 Jul 2013 22:02:51 +0000 (15:02 -0700)
author Sascha Montellese <sascha.montellese@gmail.com>
Mon, 8 Jul 2013 22:02:51 +0000 (15:02 -0700)
committer Sascha Montellese <sascha.montellese@gmail.com>
Mon, 8 Jul 2013 22:02:51 +0000 (15:02 -0700)
diff --cc project/VS2010Express/XBMC.vcxproj
Simple merge
diff --cc xbmc/windows/GUIMediaWindow.cpp
Simple merge
author	Sascha Montellese <sascha.montellese@gmail.com>
	Mon, 8 Jul 2013 22:02:51 +0000 (15:02 -0700)
committer	Sascha Montellese <sascha.montellese@gmail.com>
	Mon, 8 Jul 2013 22:02:51 +0000 (15:02 -0700)
		1	2
project/VS2010Express/XBMC.vcxproj	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/windows/GUIMediaWindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history