merge with trunk rev 12989
authorspiff_ <spiff_@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 13 May 2008 23:40:37 +0000 (23:40 +0000)
committerspiff_ <spiff_@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 13 May 2008 23:40:37 +0000 (23:40 +0000)
commitca091e43ed02288b9157b57c3ae99b2c4d76cae2
treeee026fa0e63430d64d3600709820682ab86fe853
parentb76d50a95aa7dce24071d5ebe2b04c99197dfb8c
merge with trunk rev 12989

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/watched@12990 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
129 files changed:
guilib/GUIBaseContainer.cpp
guilib/GUIBaseContainer.h
guilib/GUIButtonControl.cpp
guilib/GUIButtonControl.h
guilib/GUIControlGroup.cpp
guilib/GUIControlGroup.h
guilib/GUIControlGroupList.cpp
guilib/GUIFadeLabelControl.cpp
guilib/GUIFontManager.cpp
guilib/GUIFontManager.h
guilib/GUIFontTTF.cpp
guilib/GUIFontTTF.h
guilib/GUIInfoColor.cpp
guilib/GUIListContainer.cpp
guilib/GUIMessage.cpp
guilib/GUIMessage.h
guilib/GUIProgressControl.cpp
guilib/GuiControlFactory.cpp
guilib/GuiControlFactory.h
guilib/freetype2/include/freetype/ftoutln.h [new file with mode: 0644]
guilib/freetype2/include/freetype/ftsynth.h [deleted file]
language/Czech/strings.xml
language/Dutch/strings.xml
language/Greek/strings.xml
language/Maltese/strings.xml
language/Polish/strings.xml
skin/Project Mayhem III/PAL/CommonViewTypes.xml
skin/Project Mayhem III/PAL/CommonViewTypes_Library.xml
skin/Project Mayhem III/PAL/Home.xml
skin/Project Mayhem III/PAL/MyVideoNav.xml
skin/Project Mayhem III/PAL/custom2_SkinSettings.xml
skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml
skin/Project Mayhem III/PAL16x9/CommonViewTypes_Library.xml
skin/Project Mayhem III/PAL16x9/Home.xml
skin/Project Mayhem III/media/home-scripts/home-scripts.png [new file with mode: 0644]
skin/Project Mayhem III/media/home-scripts/home-scripts2.png [new file with mode: 0644]
skin/Project Mayhem III/media/home-scripts/home-scripts3.png [new file with mode: 0644]
system/players/paplayer/xbmc_asap.dll [new file with mode: 0644]
system/scrapers/music/allmusic.xml
system/scrapers/video/filmweb.xml
system/scrapers/video/imdb.xml
system/scrapers/video/ofdb.xml
tools/Win32/XBMC_PC.vcproj
xbmc.vcproj
xbmc/Album.cpp
xbmc/Album.h
xbmc/Application.cpp
xbmc/Artist.cpp
xbmc/Artist.h
xbmc/Autorun.cpp
xbmc/DNSNameCache.cpp
xbmc/DetectDVDType.cpp
xbmc/FileItem.cpp
xbmc/FileItem.h
xbmc/FileSystem/ASAPFileDirectory.cpp [new file with mode: 0644]
xbmc/FileSystem/ASAPFileDirectory.h [new file with mode: 0644]
xbmc/FileSystem/FactoryFileDirectory.cpp
xbmc/FileSystem/LastFMDirectory.cpp
xbmc/FileSystem/RingBuffer.h
xbmc/GUIDialogContentSettings.cpp
xbmc/GUIDialogContentSettings.h
xbmc/GUIDialogFileStacking.cpp
xbmc/GUIDialogKeyboard.cpp
xbmc/GUIDialogMediaSource.cpp
xbmc/GUIDialogPictureInfo.cpp
xbmc/GUIDialogSelect.cpp
xbmc/GUIDialogSmartPlaylistEditor.cpp
xbmc/GUIDialogSongInfo.cpp
xbmc/GUIMediaWindow.cpp
xbmc/GUIMediaWindow.h
xbmc/GUISettings.cpp
xbmc/GUIViewControl.cpp
xbmc/GUIWindowBuddies.cpp
xbmc/GUIWindowFileManager.cpp
xbmc/GUIWindowFullScreen.cpp
xbmc/GUIWindowMusicBase.cpp
xbmc/GUIWindowMusicInfo.cpp
xbmc/GUIWindowMusicInfo.h
xbmc/GUIWindowMusicNav.cpp
xbmc/GUIWindowMusicPlaylistEditor.cpp
xbmc/GUIWindowMusicSongs.cpp
xbmc/GUIWindowPictures.cpp
xbmc/GUIWindowScripts.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowSettingsProfile.cpp
xbmc/GUIWindowVideoBase.cpp
xbmc/GUIWindowVideoFiles.cpp
xbmc/GUIWindowVideoInfo.cpp
xbmc/GUIWindowVideoInfo.h
xbmc/GUIWindowVideoNav.cpp
xbmc/LastFmManager.cpp
xbmc/MusicDatabase.cpp
xbmc/MusicDatabase.h
xbmc/MusicInfoScanner.cpp
xbmc/MusicInfoTagLoaderASAP.cpp [new file with mode: 0644]
xbmc/MusicInfoTagLoaderASAP.h [new file with mode: 0644]
xbmc/NfoFile.cpp
xbmc/PartyModeManager.cpp
xbmc/PlayListPlayer.cpp
xbmc/Settings.cpp
xbmc/Util.cpp
xbmc/VideoDatabase.cpp
xbmc/VideoInfoScanner.cpp
xbmc/VideoInfoScanner.h
xbmc/VideoInfoTag.cpp
xbmc/cores/DllLoader/exports/emu_kernel32.cpp
xbmc/cores/DllLoader/exports/emu_kernel32.h
xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDPlayer.h
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.cpp
xbmc/cores/paplayer/ASAPCodec.cpp [new file with mode: 0644]
xbmc/cores/paplayer/ASAPCodec.h [new file with mode: 0644]
xbmc/cores/paplayer/CodecFactory.cpp
xbmc/cores/paplayer/DllASAP.h [new file with mode: 0644]
xbmc/inttypes.h [new file with mode: 0644]
xbmc/lib/libGoAhead/WebServer.cpp
xbmc/lib/libGoAhead/XBMChttp.cpp
xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.h
xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.cpp
xbmc/musicInfoTagLoaderFactory.cpp
xbmc/stdint.h [new file with mode: 0644]
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/GUIInfoManager.h
xbmc/utils/MusicInfoScraper.h
xbmc/utils/Weather.cpp