Merged changes from trunk up to rev 7986
authorjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 1 Mar 2007 07:50:17 +0000 (07:50 +0000)
committerjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 1 Mar 2007 07:50:17 +0000 (07:50 +0000)
commita7d03b50532435df8c2fad8e18c9932c060ed048
treefa69cbb161927a6217e689dbef9d2f64bcbbd17e
parentda6ce34e25c00224b2850e629995e1c799e16ac1
Merged changes from trunk up to rev 7986

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/videodb@7987 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
56 files changed:
guilib/GUIButtonControl.cpp
guilib/GUIButtonScroller.cpp
guilib/GUIButtonScroller.h
guilib/GUIControl.h
guilib/GUIFixedListContainer.cpp [new file with mode: 0644]
guilib/GUIFixedListContainer.h [new file with mode: 0644]
guilib/GUIWrappingListContainer.cpp
guilib/GraphicContext.cpp
guilib/GuiControlFactory.cpp
guilib/guilib.vcproj
guilib/guilib_win32.vcproj
language/English/strings.xml
language/French/langinfo.xml
language/French/strings.xml
language/German/strings.xml
language/Swedish/strings.xml
skin/Project Mayhem III/Changelog_PM.txt [deleted file]
skin/Project Mayhem III/PAL/DialogContentSettings.xml
skin/Project Mayhem III/PAL/MusicOverlay.xml
skin/Project Mayhem III/PAL16x9/MusicOverlay.xml
system/scrapers/video/filmweb.xml
system/scrapers/video/imdb.xml
tools/Scrap/Scraper.cpp
tools/Scrap/scrap.exe
xbmc/Application.cpp
xbmc/FileSystem/FileCurl.cpp
xbmc/GUIMediaWindow.cpp
xbmc/GUISettings.cpp
xbmc/GUIViewState.cpp
xbmc/GUIViewState.h
xbmc/GUIWindowMusicBase.cpp
xbmc/GUIWindowSystemInfo.cpp
xbmc/GUIWindowSystemInfo.h
xbmc/GUIWindowVideoBase.cpp
xbmc/GUIWindowVideoFiles.cpp
xbmc/GUIWindowVideoFiles.h
xbmc/Id3Tag.cpp
xbmc/NfoFile.cpp
xbmc/NfoFile.h
xbmc/Settings.cpp
xbmc/Settings.h
xbmc/VideoDatabase.cpp
xbmc/VideoDatabase.h
xbmc/cores/VideoRenderers/RenderManager.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/lib/libGoAhead/XBMChttp.cpp
xbmc/lib/libGoAhead/XBMChttp.h
xbmc/lib/libPython/XBPyThread.cpp
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/GUIInfoManager.h
xbmc/utils/IMDB.h
xbmc/utils/ScraperParser.cpp
xbmc/utils/SystemInfo.cpp
xbmc/utils/SystemInfo.h
xbmc/utils/TuxBoxUtil.cpp
xbmc/utils/TuxBoxUtil.h