Merge remote branch 'upstream/master'
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 10 Jan 2011 18:35:18 +0000 (19:35 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 10 Jan 2011 18:35:18 +0000 (19:35 +0100)
commit84d889efa1a6d41c2c3c48569a83d846e3fcf014
tree213636827ea5ee0f065d5d378437125246321ef7
parent7222d40f99bac414147c880be2f0aa3f0c9d7249
parent4476b2df112bfa69abe6e142346c574016371b58
Merge remote branch 'upstream/master'

Conflicts:
.gitignore
.gitignore
guilib/Key.h
language/English/strings.xml
xbmc/ButtonTranslator.cpp
xbmc/FileSystem/DllLibCMyth.h
xbmc/GUIDialogVideoSettings.cpp
xbmc/GUIWindowFullScreen.cpp
xbmc/Settings.cpp
xbmc/settings/VideoSettings.h
xbmc/utils/TextSearch.h