merged: changes from trunk. revs: r31001:31100
authoralwinus <alwinus@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 6 Aug 2010 14:14:38 +0000 (14:14 +0000)
committeralwinus <alwinus@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 6 Aug 2010 14:14:38 +0000 (14:14 +0000)
commitb90798f89b215972dfa6fc7b547bf33fd25f7510
tree9249f781b97fbc272dd0fc3dcb92bc6a5d27bcc2
parentd31445011dfffa46389c85e8aaa62184cf6e4c84
merged: changes from trunk. revs: r31001:31100

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2@32545 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
115 files changed:
Makefile.in
Makefile.include.in
XBMC.xcodeproj/project.pbxproj
addons/skin.confluence/720p/IncludesCodecFlagging.xml
addons/skin.confluence/720p/SettingsScreenCalibration.xml
addons/skin.confluence/720p/custom_SkinSetting_1111.xml
addons/skin.confluence/language/English/strings.xml
addons/skin.confluence/media/DefaultIconError.png
addons/skin.confluence/media/DefaultIconInfo.png
addons/skin.confluence/media/DefaultIconWarning.png
addons/skin.confluence/media/Makefile
addons/skin.confluence/media/flagging/video/dvd.png [new file with mode: 0644]
addons/skin.confluence/media/flagging/video/tv.png [new file with mode: 0644]
addons/skin.confluence/media/weather.com/default/weather.png [deleted file]
addons/skin.confluence/media/weather.com/loading/weather1.png [deleted file]
addons/skin.confluence/media/weather.com/loading/weather2.png [deleted file]
addons/skin.confluence/media/weather.com/loading/weather3.png [deleted file]
addons/skin.confluence/media/weather.com/loading/weather4.png [deleted file]
addons/skin.confluence/media/weather.com/loading/weather5.png [deleted file]
addons/skin.confluence/media/weather.com/loading/weather6.png [deleted file]
configure.in
guilib/GUIWindow.cpp
guilib/GUIWindow.h
guilib/GUIWindowManager.cpp
guilib/GraphicContext.cpp
guilib/GraphicContext.h
language/Chinese (Simple)/strings.xml
language/English/strings.xml
language/French/strings.xml
lib/libass/xbmc/Makefile.in
project/VS2008Express/XBMC.vcproj
project/Win32BuildSetup/BuildSetup.bat
project/Win32BuildSetup/readme.txt
system/players/dvdplayer/avcodec-52.dll
system/players/dvdplayer/avformat-52.dll
system/players/dvdplayer/avutil-50.dll
system/players/dvdplayer/postproc-51.dll
system/players/dvdplayer/swscale-0.6.1.dll
tools/EventClients/Makefile
tools/Linux/xbmc.sh.in
xbmc/Album.cpp
xbmc/Application.cpp
xbmc/Application.h
xbmc/FileSystem/Directory.cpp
xbmc/FileSystem/Directory.h
xbmc/FileSystem/FileCDDA.cpp
xbmc/FileSystem/FileCurl.cpp
xbmc/FileSystem/FileHD.cpp
xbmc/FileSystem/FileISO.cpp
xbmc/FileSystem/FileRar.cpp
xbmc/FileSystem/FileSFTP.cpp
xbmc/FileSystem/FileSmb.cpp
xbmc/FileSystem/FileXBMSP.cpp
xbmc/FileSystem/FileZip.cpp
xbmc/FileSystem/HDHomeRun.cpp
xbmc/FileSystem/IFile.cpp
xbmc/FileSystem/SAPFile.cpp
xbmc/GUISettings.cpp
xbmc/GUIWindowAddonBrowser.cpp
xbmc/GUIWindowFullScreen.cpp
xbmc/GUIWindowFullScreen.h
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowVideoBase.cpp
xbmc/GUIWindowVideoBase.h
xbmc/GUIWindowVideoInfo.cpp
xbmc/MusicInfoTag.cpp
xbmc/RenderSystem.h
xbmc/RenderSystemDX.cpp
xbmc/RenderSystemDX.h
xbmc/RenderSystemGL.cpp
xbmc/RenderSystemGL.h
xbmc/RenderSystemGLES.cpp
xbmc/RenderSystemGLES.h
xbmc/SortFileItem.cpp
xbmc/VideoDatabase.cpp
xbmc/VideoInfoScanner.cpp
xbmc/VideoInfoScanner.h
xbmc/addons/Addon.cpp
xbmc/cores/AudioRenderers/Win32WASAPI.cpp
xbmc/cores/AudioRenderers/Win32WASAPI.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.c
xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/cores/dvdplayer/DVDTSCorrection.cpp
xbmc/cores/dvdplayer/DVDTSCorrection.h
xbmc/cores/paplayer/ADPCMCodec/Makefile.in
xbmc/cores/paplayer/GYMCodec/Makefile.in
xbmc/cores/paplayer/NSFCodec/Makefile.in
xbmc/cores/paplayer/SIDCodec/Makefile.in
xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in
xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in
xbmc/cores/paplayer/timidity/Makefile.in
xbmc/cores/paplayer/vgmstream/Makefile.in
xbmc/lib/cximage-6.0/Makefile.in
xbmc/lib/libPython/linux/Makefile.in
xbmc/lib/libexif/Makefile.in
xbmc/lib/libhdhomerun/Makefile.in
xbmc/lib/libid3tag/Makefile.in
xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in
xbmc/utils/Builtins.cpp
xbmc/utils/IMDB.cpp
xbmc/utils/IMDB.h
xbmc/utils/MusicInfoScraper.cpp
xbmc/utils/SaveFileStateJob.h [new file with mode: 0644]
xbmc/utils/ScraperParser.cpp
xbmc/utils/ScraperUrl.h
xbmc/visualizations/Goom/Makefile.in
xbmc/visualizations/OpenGLSpectrum/Makefile.in
xbmc/visualizations/WaveForm/Makefile.in
xbmc/visualizations/XBMCProjectM/Makefile.in
xbmc/win32/WINFileSMB.cpp