Merge remote branch 'origin/trunk' into trac-8658-try2 trac-8658-try2
authorceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 26 Sep 2010 02:52:45 +0000 (02:52 +0000)
committerceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 26 Sep 2010 02:52:45 +0000 (02:52 +0000)
commitb5f2d7e17ec0dd0e1976df5afc19e19a1f7d075f
tree6215d8096584df0cf98ef647fe8aa8a0cee87a1c
parent9de4d3a56e25ce4223e44b13b1c31b50792b9bae
Merge remote branch 'origin/trunk' into trac-8658-try2

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/trac-8658-try2@34190 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
222 files changed:
.gitignore
addons/metadata.common.htbackdrops.com/addon.xml
addons/metadata.common.htbackdrops.com/htbackdrops.xml
addons/metadata.common.themoviedb.org/addon.xml
addons/metadata.themoviedb.org/addon.xml
addons/repository.xbmc.org/addon.xml
addons/skin.confluence/720p/Font.xml
addons/skin.confluence/720p/MusicOSD.xml
addons/skin.confluence/720p/VideoOSD.xml
addons/skin.confluence/720p/custom_SkinSetting_1111.xml
addons/skin.confluence/addon.xml
addons/skin.confluence/language/Dutch/strings.xml
addons/skin.confluence/language/English/strings.xml
addons/skin.confluence/language/German/strings.xml
addons/skin.confluence/language/Hungarian/strings.xml
addons/skin.confluence/language/Norwegian/strings.xml
addons/skin.confluence/language/Polish/strings.xml
addons/skin.confluence/language/Romanian/strings.xml
addons/visualization.dxspectrum/addon.xml
addons/visualization.milkdrop/addon.xml
addons/webinterface.default/addon.xml
addons/webinterface.default/css/core.css
addons/webinterface.default/index.html
addons/webinterface.default/js/Core.js
addons/webinterface.default/js/NowPlayingManager.js
guilib/GUIBaseContainer.cpp
guilib/GUIListItem.cpp
guilib/GUIListItem.h
guilib/common/LIRC.cpp
language/Bulgarian/langinfo.xml
language/Catalan/langinfo.xml
language/Chinese (Simple)/langinfo.xml
language/Chinese (Simple)/strings.xml
language/Chinese (Traditional)/langinfo.xml
language/Chinese (Traditional)/strings.xml
language/Croatian/langinfo.xml
language/Czech/langinfo.xml
language/Danish/langinfo.xml
language/Dutch/langinfo.xml
language/Dutch/strings.xml
language/English (US)/langinfo.xml
language/English/langinfo.xml
language/English/strings.xml
language/Esperanto/langinfo.xml
language/Finnish/langinfo.xml
language/French/langinfo.xml
language/French/strings.xml
language/German/langinfo.xml
language/German/strings.xml
language/Greek/langinfo.xml
language/Hebrew/langinfo.xml
language/Hungarian/langinfo.xml
language/Hungarian/strings.xml
language/Icelandic/langinfo.xml
language/Indonesian/langinfo.xml
language/Italian/langinfo.xml
language/Italian/strings.xml
language/Japanese/langinfo.xml
language/Japanese/strings.xml
language/Korean/langinfo.xml
language/Korean/strings.xml
language/Maltese/langinfo.xml
language/Norwegian/langinfo.xml
language/Norwegian/strings.xml
language/Polish/langinfo.xml
language/Polish/strings.xml
language/Portuguese (Brazil)/langinfo.xml
language/Portuguese/langinfo.xml
language/Portuguese/strings.xml
language/Romanian/langinfo.xml
language/Romanian/strings.xml
language/Russian/langinfo.xml
language/Serbian (Cyrillic)/langinfo.xml
language/Serbian/langinfo.xml
language/Slovak/langinfo.xml
language/Slovenian/langinfo.xml
language/Spanish (Mexico)/langinfo.xml
language/Spanish (Mexico)/strings.xml
language/Spanish/langinfo.xml
language/Swedish/langinfo.xml
language/Turkish/langinfo.xml
language/Ukrainian/langinfo.xml
lib/libmodplug/libmodplug.def [new file with mode: 0644]
lib/libmodplug/libmodplug_2008.vcproj
lib/libmodplug/libmodplug_2010.vcxproj
lib/libmodplug/src/load_abc.cpp
project/BuildDependencies/scripts/libbzip2_d.txt
project/BuildDependencies/scripts/libcurl_d.bat
project/BuildDependencies/scripts/libcurl_d.txt
project/VS2008Express/XBMC for Windows.sln
project/VS2010Express/UnrarXLib.vcxproj
project/VS2010Express/XBMC for Windows.sln
project/VS2010Express/XBMC.vcxproj
project/VS2010Express/XBMC.vcxproj.filters
project/VS2010Express/guilib.vcxproj
system/keymaps/keyboard.xml
tools/EventClients/lib/c#/EventClient.cs
tools/Linux/xbmc-standalone.sh
tools/XBMCLive/Live-post.d/1-setVolumes.sh [deleted file]
tools/XBMCLive/Live-post.d/2-mountDisks.sh [deleted file]
tools/XBMCLive/Live-post.d/3-setupWakeFromUSB.sh [deleted file]
tools/XBMCLive/Live-pre.d/1-configureXorg.sh [deleted file]
tools/XBMCLive/Live-pre.d/2-profileRedir.sh [deleted file]
tools/XBMCLive/Live-pre.d/3-configNVIDIAHDMI.sh [deleted file]
tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/14runHooks
tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/93modifyGrubMenu.lucid-variant
tools/XBMCLive/SDK/buildHook-proposed.sh.lucid-variant [new file with mode: 0755]
tools/XBMCLive/SDK/buildLive/Files/binary_grub/grub.cfg.lucid-variant
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_AMD.sh [deleted file]
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA.sh [deleted file]
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA_HDMI.sh [deleted file]
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/setupSources.sh [deleted file]
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/hwSetup_AMD.sh [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/hwSetup_NVIDIA.sh [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/setupSources.sh [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11.karmic-variant/Xsession.d/90consolekit [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11.karmic/Xsession.d/90consolekit [deleted file]
tools/XBMCLive/SDK/buildWithOptions.sh
tools/XBMCLive/diskmounter
tools/XBMCLive/live-post.d/1-setVolumes.sh [new file with mode: 0644]
tools/XBMCLive/live-post.d/2-mountDisks.sh [new file with mode: 0644]
tools/XBMCLive/live-post.d/3-setupWakeFromUSB.sh [new file with mode: 0644]
tools/XBMCLive/live-pre.d/1-configureXorg.sh [new file with mode: 0644]
tools/XBMCLive/live-pre.d/2-profileRedir.sh [new file with mode: 0644]
tools/XBMCLive/live-pre.d/3-configNVIDIAHDMI.sh [new file with mode: 0644]
tools/XBMCLive/live-pre.d/4-configNVIDIAasoundrc.sh [new file with mode: 0644]
tools/XBMCLive/setAlsaVolumes
tools/XBMCLive/xbmc-live.upstart-new
xbmc/Application.cpp
xbmc/Application.h
xbmc/FileSystem/DllLibCMyth.h
xbmc/FileSystem/FileCurl.cpp
xbmc/FileSystem/FileCurl.h
xbmc/FileSystem/HDDirectory.cpp
xbmc/FileSystem/MythFile.cpp
xbmc/FileSystem/MythFile.h
xbmc/GUIDialogAddonSettings.cpp
xbmc/GUIDialogAudioSubtitleSettings.cpp
xbmc/GUIDialogVideoSettings.cpp
xbmc/GUIWindowFullScreen.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowSettingsCategory.h
xbmc/KeyboardStat.cpp
xbmc/LangInfo.cpp
xbmc/LangInfo.h
xbmc/MusicDatabase.cpp
xbmc/MusicInfoTagLoaderSid.cpp
xbmc/PowerManager.cpp
xbmc/RenderSystemDX.cpp
xbmc/RenderSystemDX.h
xbmc/RenderSystemGL.cpp
xbmc/RenderSystemGLES.cpp
xbmc/StringUtils.cpp
xbmc/StringUtils.h
xbmc/URL.cpp
xbmc/Util.cpp
xbmc/VideoInfoScanner.cpp
xbmc/WinSystemEGL.cpp
xbmc/WinSystemX11.cpp
xbmc/WinSystemX11.h
xbmc/addons/AddonManager.cpp
xbmc/addons/Repository.cpp
xbmc/addons/Scraper.cpp
xbmc/cores/AudioRenderers/ALSADirectSound.cpp
xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp
xbmc/cores/AudioRenderers/PulseAudioDirectSound.cpp
xbmc/cores/VideoRenderers/BaseRenderer.cpp
xbmc/cores/VideoRenderers/RenderManager.cpp
xbmc/cores/VideoRenderers/WinRenderer.cpp
xbmc/cores/VideoRenderers/WinRenderer.h
xbmc/cores/dvdplayer/DVDClock.cpp
xbmc/cores/dvdplayer/DVDClock.h
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h
xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDPlayer.h
xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/cores/dvdplayer/DVDStreamInfo.cpp
xbmc/cores/dvdplayer/DVDStreamInfo.h
xbmc/cores/dvdplayer/DVDTSCorrection.cpp
xbmc/cores/dvdplayer/DVDTSCorrection.h
xbmc/cores/dvdplayer/Edl.cpp
xbmc/cores/dvdplayer/Edl.h
xbmc/cores/paplayer/CodecFactory.cpp
xbmc/cores/paplayer/DllSidplay2.h
xbmc/cores/paplayer/MP3codec.cpp
xbmc/cores/paplayer/SIDCodec.cpp
xbmc/cores/paplayer/SIDCodec.h
xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/XBMCSID.cpp
xbmc/lib/cmyth/include/cmyth/cmyth.h
xbmc/lib/cmyth/libcmyth/cmyth_local.h
xbmc/lib/cmyth/libcmyth/commbreak.c
xbmc/lib/libPython/xbmcmodule/player.cpp
xbmc/lib/libhdhomerun/hdhomerun/hdhomerun.vcxproj [new file with mode: 0644]
xbmc/lib/libhdhomerun/hdhomerun/hdhomerun.vcxproj.filters [new file with mode: 0644]
xbmc/lib/libjsonrpc/JSONRPC.cpp
xbmc/lib/libjsonrpc/TCPServer.cpp
xbmc/linux/ConsoleUPowerSyscall.cpp
xbmc/linux/DBusMessage.cpp
xbmc/linux/DBusMessage.h
xbmc/linux/DBusUtil.cpp
xbmc/osx/CocoaPowerSyscall.cpp
xbmc/osx/WinSystemOSX.mm
xbmc/utils/AlarmClock.cpp
xbmc/utils/AlarmClock.h
xbmc/utils/Builtins.cpp
xbmc/utils/CharsetConverter.cpp
xbmc/utils/CharsetConverter.h
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/PasswordManager.cpp
xbmc/utils/PasswordManager.h
xbmc/utils/WebServer.cpp
xbmc/utils/WebServer.h
xbmc/visualizations/Milkdrop/vis_milkdrop/plugin.cpp
xbmc/visualizations/Milkdrop/vis_milkdrop/plugin.h
xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp