Merge remote branch 'upstream/master'
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 8 Jan 2011 16:34:09 +0000 (17:34 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 8 Jan 2011 16:34:09 +0000 (17:34 +0100)
commit7222d40f99bac414147c880be2f0aa3f0c9d7249
treef7f4f48212dba179c0ae802169e12676ed44af80
parenteaa91f73515600b162a512a496c23d1b32a72d54
parent263c34206b0b7e63dcc5a34bca8bd716bea676a9
Merge remote branch 'upstream/master'
.gitignore
addons/skin.confluence/720p/Home.xml
addons/skin.confluence/720p/custom_SkinSetting_1111.xml
addons/skin.confluence/language/English/strings.xml
addons/skin.confluence/language/German/strings.xml
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/GUIInfoManager.h