Merge pull request #324 from cptspiff/rollbacks

author Arne Morten Kvarving <spiff@xbmc.org>

Fri, 12 Aug 2011 07:41:31 +0000 (00:41 -0700)

committer Arne Morten Kvarving <spiff@xbmc.org>

Fri, 12 Aug 2011 07:41:31 +0000 (00:41 -0700)
author Arne Morten Kvarving <spiff@xbmc.org>
Fri, 12 Aug 2011 07:41:31 +0000 (00:41 -0700)
committer Arne Morten Kvarving <spiff@xbmc.org>
Fri, 12 Aug 2011 07:41:31 +0000 (00:41 -0700)
diff --cc language/English/strings.xml
Simple merge
diff --cc xbmc/addons/AddonManager.cpp
Simple merge
diff --cc xbmc/addons/GUIDialogAddonInfo.cpp
Simple merge
diff --cc xbmc/filesystem/AddonsDirectory.cpp
Simple merge
author	Arne Morten Kvarving <spiff@xbmc.org>
	Fri, 12 Aug 2011 07:41:31 +0000 (00:41 -0700)
committer	Arne Morten Kvarving <spiff@xbmc.org>
	Fri, 12 Aug 2011 07:41:31 +0000 (00:41 -0700)
		1	2
language/English/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/addons/AddonManager.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/addons/GUIDialogAddonInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/filesystem/AddonsDirectory.cpp	patch \|	diff1 \|	diff2 \|	blob \| history