merged: trunk revisions up to 12773
authorjwvanderbeck <jwvanderbeck@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 22 Apr 2008 21:08:53 +0000 (21:08 +0000)
committerjwvanderbeck <jwvanderbeck@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 22 Apr 2008 21:08:53 +0000 (21:08 +0000)
commitcb699eb41016f93c37f3f257b871f5206a3d00b3
treedf20e0bd20aa10671f2511119e10aa128dfb8433
parentf5adcbb73f46df573096d16e4b3f161b94d449cb
merged: trunk revisions up to 12773
Hopefully I didn't screw anything up in all the manual merges

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/watched@12783 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
39 files changed:
guilib/GUIInfoColor.cpp
guilib/GUIWindow.cpp
guilib/GUIWindow.h
language/Danish/strings.xml
language/Dutch/strings.xml
language/English/strings.xml
language/Greek/strings.xml
skin/Project Mayhem III/PAL/3D_CoverView.xml
skin/Project Mayhem III/PAL/DialogVideoInfo.xml
skin/Project Mayhem III/PAL16x9/3D_CoverView.xml
system/scrapers/music/allmusic.xml
tools/Fake Episode Maker/main.py [new file with mode: 0644]
tools/Fake Episode Maker/main.pyc [new file with mode: 0644]
tools/Fake Episode Maker/openAnything.py [new file with mode: 0644]
tools/Fake Episode Maker/openAnything.pyc [new file with mode: 0644]
tools/Fake Episode Maker/readme.txt [new file with mode: 0644]
tools/Fake Episode Maker/shows.txt [new file with mode: 0644]
tools/Win32/XBMC_PC.vcproj
tools/Win32/run_me_first.bat
xbmc/DNSNameCache.cpp
xbmc/DNSNameCache.h
xbmc/Edl.cpp
xbmc/Edl.h
xbmc/FileItem.cpp
xbmc/FileItem.h
xbmc/GUISettings.cpp
xbmc/GUIWindowMusicBase.cpp
xbmc/GUIWindowMusicNav.cpp
xbmc/GUIWindowVideoInfo.cpp
xbmc/GUIWindowVideoInfo.h
xbmc/GUIWindowVideoNav.cpp
xbmc/MusicDatabase.cpp
xbmc/VideoDatabase.cpp
xbmc/cores/dvdplayer/DVDOverlayContainer.cpp
xbmc/cores/dvdplayer/DVDOverlayContainer.h
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDPlayer.h
xbmc/cores/mplayer/mplayer.cpp
xbmc/utils/GUIInfoManager.cpp