merge -r 22900:22950
authorbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 20 Sep 2009 15:30:55 +0000 (15:30 +0000)
committerbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 20 Sep 2009 15:30:55 +0000 (15:30 +0000)
commit96594a0eebcd54d728fce0589ea63b38036820b7
treea43bc375a268b2dd7d7aa93c4448febda8eb8b0d
parentd50412a109e983bd91139ad637d2e5168fd79455
merge -r 22900:22950

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/prettylights@23023 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
85 files changed:
XBMC.xcodeproj/project.pbxproj
guilib/AudioContext.cpp
guilib/GraphicContext.cpp
guilib/TextureBundle.cpp
language/Chinese (Simple)/strings.xml
language/English/strings.xml
language/Greek/strings.xml
language/Korean/strings.xml
language/Swedish/strings.xml
system/scrapers/music/allmusic.xml
system/scrapers/music/allmusic_merlin_lastfm.xml
system/scrapers/music/common/allmusic.xml
system/scrapers/music/discogs.xml
system/scrapers/music/freebase.xml
system/scrapers/music/lastfm.xml
system/scrapers/video/filmaffinity.xml
system/scrapers/video/ofdb.png
tools/EventClients/Clients/OSXRemote/XBMCHelper.xcodeproj/project.pbxproj
tools/XBMCTex/Bundler.cpp
tools/XBMCTex/XBMCTex.cpp
tools/XBMCTex/xbox.cpp
tools/XBMCTex/xbox.h
visualisations/goom_win32.vis
xbmc/AdvancedSettings.cpp
xbmc/AdvancedSettings.h
xbmc/Application.cpp
xbmc/FileItem.cpp
xbmc/FileSystem/CMythFile.cpp
xbmc/FileSystem/curl/curl.h
xbmc/FileSystem/curl/curlbuild.h
xbmc/FileSystem/curl/curlrules.h
xbmc/FileSystem/curl/curlver.h
xbmc/FileSystem/curl/stdcheaders.h
xbmc/FileSystem/curl/typecheck-gcc.h
xbmc/GUIDialogContentSettings.cpp
xbmc/GUIDialogContentSettings.h
xbmc/GUISettings.cpp
xbmc/GUIViewStatePictures.cpp
xbmc/GUIWindowFullScreen.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowSlideShow.cpp
xbmc/KeyboardStat.cpp
xbmc/MusicDatabase.cpp
xbmc/PluginSettings.cpp
xbmc/PluginSettings.h
xbmc/ScraperSettings.h
xbmc/Settings.cpp
xbmc/VideoInfoScanner.cpp
xbmc/WinEventsWin32.cpp
xbmc/WinSystem.h
xbmc/WinSystemOSX.cpp
xbmc/WinSystemOSX.h
xbmc/WinSystemOSXGL.cpp
xbmc/WinSystemOSXGL.h
xbmc/WinSystemWin32.cpp
xbmc/WinSystemWin32.h
xbmc/WinSystemWin32DX.cpp
xbmc/WinSystemWin32DX.h
xbmc/WinSystemWin32GL.cpp
xbmc/WinSystemWin32GL.h
xbmc/WinSystemX11.cpp
xbmc/WinSystemX11.h
xbmc/WinSystemX11GL.cpp
xbmc/WinSystemX11GL.h
xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h
xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h
xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h
xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLiba52.h
xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
xbmc/cores/ffmpeg/DllAvCodec.h
xbmc/cores/ffmpeg/DllPostProc.h
xbmc/cores/ffmpeg/DllSwScale.h
xbmc/cores/paplayer/DllAc3codec.h
xbmc/cores/paplayer/DllDCACodec.h
xbmc/cores/paplayer/DllLibFlac.h
xbmc/cores/paplayer/DllMpcCodec.h
xbmc/cores/paplayer/DllWAVPack.h
xbmc/linux/XSyncUtils.cpp
xbmc/utils/MusicAlbumInfo.cpp
xbmc/utils/MusicArtistInfo.cpp
xbmc/utils/MusicInfoScraper.cpp
xbmc/utils/ScraperParser.cpp
xbmc/utils/ScraperParser.h