svn merge -r 26884:27000 https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk/
authorbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 25 Jan 2010 23:35:10 +0000 (23:35 +0000)
committerbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 25 Jan 2010 23:35:10 +0000 (23:35 +0000)
commit3f9da09f36e6f161983e316181d691f9faf58e6e
treea5594579dc476585ef0e8b3b3c7b82a5bd2ac894
parent5b20848055906fc2554b28c4a07bcd797a077a75
svn merge -r 26884:27000 https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk/

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/boblight@27181 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
129 files changed:
Makefile.in
README.ubuntu
XBMC.xcodeproj/project.pbxproj
configure.in
guilib/D3DResource.cpp
guilib/D3DResource.h
guilib/GUIBaseContainer.cpp
guilib/GUIInfoTypes.cpp
guilib/GUIInfoTypes.h
guilib/GUIListItem.cpp
guilib/GUIListItem.h
guilib/GUIStaticItem.cpp [new file with mode: 0644]
guilib/GUIStaticItem.h [new file with mode: 0644]
guilib/GUIWindow.cpp
guilib/GUIWindow.h
guilib/GUIWindowManager.cpp
guilib/GUIWrappingListContainer.cpp
guilib/Makefile
language/Chinese (Simple)/langinfo.xml
language/Chinese (Simple)/strings.xml
language/English/strings.xml
language/Hungarian/strings.xml
language/Swedish/strings.xml
project/VS2008Express/guilib.vcproj
skin/Confluence/720p/ViewsFileMode.xml
skin/Confluence/720p/ViewsMusicLibrary.xml
skin/Confluence/720p/ViewsVideoLibrary.xml
skin/Confluence/language/Hungarian/strings.xml
system/shaders/convolution-4x4.glsl
system/shaders/convolution-6x6.glsl
system/shaders/yuv2rgb_4x4_d3d.fx [new file with mode: 0644]
system/shaders/yuv2rgb_6x6_d3d.fx [new file with mode: 0644]
tools/XBMCLive/SDK/build.sh
tools/XBMCLive/SDK/buildDEBs/build.sh
tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/13-setTvheadend
tools/XBMCLive/SDK/buildLive/Files/chroot_local-packageslists/packages.list
tools/XBMCLive/SDK/buildLive/Files/chroot_sources/tvheadend.binary.gpg [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/chroot_sources/tvheadend.chroot.gpg [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/chroot_sources/xbmc-svn.binary.gpg [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/chroot_sources/xbmc-svn.chroot.gpg [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/chroot_sources/xbmc-svn.list.binary [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/chroot_sources/xbmc-svn.list.chroot [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/mkConfig.sh
tools/XBMCLive/SDK/buildNvidiaOnly.sh [deleted file]
tools/XBMCLive/SDK/buildWithOptions.sh [new file with mode: 0755]
tools/XBMCLive/SDK/buildWithXbmcSvn.sh [deleted file]
tools/XBMCLive/SDK/liveOnlyHook.sh [new file with mode: 0755]
tools/XBMCLive/SDK/nvidiaOnlyHook.sh
tools/XBMCLive/SDK/setAptProxy.sh [deleted file]
tools/XBMCLive/SDK/usbhddImageHook.sh [new file with mode: 0755]
tools/XBMCLive/SDK/xbmcSvnHook.sh
xbmc/AdvancedSettings.cpp
xbmc/Application.cpp
xbmc/ApplicationMessenger.cpp
xbmc/ApplicationMessenger.h
xbmc/ButtonTranslator.cpp
xbmc/FileItem.cpp
xbmc/FileItem.h
xbmc/FileSystem/CMythFile.cpp
xbmc/FileSystem/CMythFile.h
xbmc/FileSystem/DAVDirectory.cpp
xbmc/FileSystem/DllLibCurl.cpp
xbmc/FileSystem/FileCurl.cpp
xbmc/FileSystem/Makefile [deleted file]
xbmc/GUIDialogVideoSettings.cpp
xbmc/GUIMediaWindow.cpp
xbmc/GUIWindowMusicBase.cpp
xbmc/GUIWindowMusicBase.h
xbmc/GUIWindowMusicNav.cpp
xbmc/GUIWindowMusicNav.h
xbmc/GUIWindowVideoBase.cpp
xbmc/GUIWindowVideoNav.cpp
xbmc/LastFmManager.cpp
xbmc/MusicDatabase.cpp
xbmc/MusicDatabase.h
xbmc/PartyModeManager.cpp
xbmc/PartyModeManager.h
xbmc/Settings.cpp
xbmc/VideoReferenceClock.cpp
xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
xbmc/cores/VideoRenderers/BaseRenderer.cpp
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
xbmc/cores/VideoRenderers/OverlayRendererDX.cpp
xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
xbmc/cores/VideoRenderers/RenderManager.cpp
xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp
xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.h
xbmc/cores/VideoRenderers/WinRenderer.cpp
xbmc/cores/VideoRenderers/WinRenderer.h
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.h
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
xbmc/cores/dvdplayer/DVDMessageQueue.cpp
xbmc/cores/dvdplayer/DVDMessageQueue.h
xbmc/cores/paplayer/SIDCodec/Makefile.in
xbmc/lib/libPython/Python/Mac/Modules/osa/_OSAmodule.c
xbmc/lib/libPython/XBPython.cpp
xbmc/lib/libPython/XBPython.h
xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
xbmc/lib/libPython/xbmcmodule/PythonPlayer.cpp
xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
xbmc/lib/libPython/xbmcmodule/player.cpp
xbmc/linux/XHandle.cpp
xbmc/linux/XHandle.h
xbmc/linux/XSyncUtils.cpp
xbmc/osx/Makefile
xbmc/osx/SemaphoreDarwin.cpp [new file with mode: 0644]
xbmc/osx/SemaphoreDarwin.h [new file with mode: 0644]
xbmc/posix/Makefile [new file with mode: 0644]
xbmc/posix/SemaphorePOSIX.cpp [new file with mode: 0644]
xbmc/posix/SemaphorePOSIX.h [new file with mode: 0644]
xbmc/settings/VideoSettings.h
xbmc/utils/Builtins.cpp
xbmc/utils/CPUInfo.cpp
xbmc/utils/CPUInfo.h
xbmc/utils/CharsetConverter.cpp
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/ISemaphore.h [new file with mode: 0644]
xbmc/utils/LockFree.cpp
xbmc/utils/Makefile
xbmc/utils/Semaphore.cpp [new file with mode: 0644]
xbmc/utils/Semaphore.hpp [new file with mode: 0644]
xbmc/utils/TimeUtils.cpp