[XBOX] merged: mainline/trunk revisions
authorarnova <arnova@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 31 Dec 2009 07:30:37 +0000 (07:30 +0000)
committerarnova <arnova@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 31 Dec 2009 07:30:37 +0000 (07:30 +0000)
commit1716d01dd551aceca1635cfdbf777c200705c7a5
tree306da9a03b8ca2ac8dd95b0a316be8d7f810ce2b
parent8c5cc71827962134f2f3d15f4694f3e57f28fe48
[XBOX] merged: mainline/trunk revisions
25878-25886,25894,25908,25911,25934,25935,25938,25967,25977,25984,25985
26002,26028,26030,26080,26145,26149,26165,26180,26191-26194,26196,26203

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/xbox@26219 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
43 files changed:
guilib/GUIWindowManager.cpp
language/English/strings.xml
language/Spanish/strings.xml
language/Swedish/strings.xml
system/scrapers/video/MyMovies.png [deleted file]
system/scrapers/video/MyMovies.xml [deleted file]
system/scrapers/video/imdb.xml
system/scrapers/video/movieplayer-it-film.jpg [deleted file]
system/scrapers/video/movieplayer-it-film.xml
system/scrapers/video/movieplayer-it-tv.xml [new file with mode: 0644]
system/scrapers/video/movieplayer-it.jpg [new file with mode: 0644]
system/scrapers/video/myMovies.png [new file with mode: 0644]
system/scrapers/video/myMovies.xml [new file with mode: 0644]
system/scrapers/video/tmdb.xml
xbmc/FileItem.cpp
xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp
xbmc/GUIDialogMediaSource.cpp
xbmc/GUISettings.cpp
xbmc/GUIWindowMusicInfo.cpp
xbmc/GUIWindowPointer.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowVideoInfo.cpp
xbmc/MusicDatabase.cpp
xbmc/Settings.cpp
xbmc/Util.cpp
xbmc/VideoDatabase.cpp
xbmc/cores/dvdplayer/DVDAudio.cpp
xbmc/cores/dvdplayer/DVDAudio.h
xbmc/cores/dvdplayer/DVDMessage.h
xbmc/cores/dvdplayer/DVDMessageQueue.cpp
xbmc/cores/dvdplayer/DVDMessageQueue.h
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDPlayer.h
xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
xbmc/cores/dvdplayer/DVDPlayerAudio.h
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.h
xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp
xbmc/lib/cximage-6.0/CxImage/ximajpg.cpp
xbmc/lib/libPython/XBPyThread.cpp
xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp
xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
xbmc/utils/GUIInfoManager.cpp