Merge remote branch 'origin/trunk' into trac-8658
authorceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 27 Aug 2010 01:52:00 +0000 (01:52 +0000)
committerceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 27 Aug 2010 01:52:00 +0000 (01:52 +0000)
commit11859e164185706a2702cc36df21b64195514cd0
tree51b7b2aa434a88b4a6f2aead64d3c83cf324773f
parentd2e06bf25cf4b7d70d6341ad155659543aeb290c
Merge remote branch 'origin/trunk' into trac-8658

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/trac-8658@33197 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
59 files changed:
XBMC.xcodeproj/project.pbxproj
addons/metadata.albums.allmusic.com/addon.xml
addons/metadata.albums.allmusic.com/resources/language/German/strings.xml [new file with mode: 0644]
addons/metadata.common.allmusic.com/addon.xml
addons/metadata.common.hdtrailers.net/addon.xml
addons/metadata.common.htbackdrops.com/addon.xml
addons/metadata.common.last.fm/addon.xml
addons/metadata.mtv.com/addon.xml
addons/metadata.themoviedb.org/addon.xml
addons/metadata.themoviedb.org/resources/language/German/strings.xml [new file with mode: 0644]
addons/metadata.tvdb.com/addon.xml
addons/metadata.tvdb.com/resources/language/German/strings.xml [new file with mode: 0644]
addons/repository.xbmc.org/addon.xml
addons/screensaver.xbmc.builtin.black/addon.xml
addons/screensaver.xbmc.builtin.dim/addon.xml
addons/screensaver.xbmc.builtin.dim/resources/language/German/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.slideshow/addon.xml
addons/screensaver.xbmc.builtin.slideshow/resources/language/German/strings.xml [new file with mode: 0644]
addons/visualization.itunes/addon.xml
addons/visualization.waveform/addon.xml
addons/weather.xbmc.builtin/addon.xml
guilib/system.h
language/Japanese/langinfo.xml
lib/libbluray_win32/how_to_build.txt [new file with mode: 0644]
lib/libbluray_win32/libbluray/bluray.h [new file with mode: 0644]
lib/libbluray_win32/libbluray/filesystem.h [new file with mode: 0644]
project/VS2008Express/XBMC.vcproj
project/VS2010Express/XBMC.vcxproj
project/VS2010Express/XBMC.vcxproj.filters
system/players/dvdplayer/libbluray.dll [new file with mode: 0644]
tools/Linux/packaging/debian/rules
xbmc/DllPaths_win32.h
xbmc/FileItem.cpp
xbmc/FileItem.h
xbmc/GUIDialogVideoSettings.cpp
xbmc/GUIViewState.cpp
xbmc/GUIWindowMusicNav.cpp
xbmc/Makefile.in
xbmc/URIUtils.cpp [new file with mode: 0644]
xbmc/URIUtils.h [new file with mode: 0644]
xbmc/Util.cpp
xbmc/VideoDatabase.cpp
xbmc/VideoInfoScanner.cpp
xbmc/addons/Scraper.cpp
xbmc/cores/VideoRenderers/BaseRenderer.cpp
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
xbmc/cores/VideoRenderers/WinRenderer.cpp
xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/general.texi
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/Makefile
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/allformats.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0033-added-ffmpeg-spdif-demuxer-fixes-ac3-in-wav.patch [new file with mode: 0644]
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/cores/paplayer/CodecFactory.cpp
xbmc/cores/paplayer/DVDPlayerCodec.cpp
xbmc/cores/paplayer/DVDPlayerCodec.h
xbmc/lib/libPython/xbmcmodule/player.cpp
xbmc/utils/GUIInfoManager.cpp