svn merge -r 27000:27050 https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk/
authorbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 27 Jan 2010 21:21:35 +0000 (21:21 +0000)
committerbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 27 Jan 2010 21:21:35 +0000 (21:21 +0000)
commit6c199337037af603a6b8b258bf0ee6ca1cfb16b1
tree077d5f80e2f75db0b3085b3ed46d19e6304200a7
parent3f9da09f36e6f161983e316181d691f9faf58e6e
svn merge -r 27000:27050 https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk/

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/boblight@27232 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
121 files changed:
XBMC.xcodeproj/project.pbxproj
guilib/GUIAudioManager.cpp
guilib/GUIBaseContainer.cpp
guilib/GUIButtonControl.cpp
guilib/GUIButtonScroller.cpp
guilib/GUICheckMarkControl.cpp
guilib/GUIControl.cpp
guilib/GUIDialog.cpp
guilib/GUIEditControl.cpp
guilib/GUIFixedListContainer.cpp
guilib/GUIListContainer.cpp
guilib/GUIMoverControl.cpp
guilib/GUIMultiSelectText.cpp
guilib/GUIPanelContainer.cpp
guilib/GUIRadioButtonControl.cpp
guilib/GUIResizeControl.cpp
guilib/GUIScrollBarControl.cpp
guilib/GUISelectButtonControl.cpp
guilib/GUISliderControl.cpp
guilib/GUISpinControl.cpp
guilib/GUIStandardWindow.cpp
guilib/GUIToggleButtonControl.cpp
guilib/GUIVisualisationControl.cpp
guilib/GUIWindow.cpp
guilib/GUIWindowManager.cpp
guilib/GUIWrappingListContainer.cpp
guilib/Key.h
guilib/system.h
language/Chinese (Simple)/strings.xml
language/English/strings.xml
language/Swedish/strings.xml
system/scrapers/video/KinoPoisk.xml
system/scrapers/video/imdb.xml
tools/XBMCLive/SDK/build.sh
tools/XBMCLive/SDK/buildBinaryDrivers/Files/chroot_local-hooks/30-buildNVIDIA.sh
tools/XBMCLive/SDK/buildLive/Files/binary_grub/menu.lst
tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11/Xsession.d/90consolekit [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/pm/sleep.d/99lirc-resume [new file with mode: 0755]
tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/lib/firmware/dvb-usb-af9015.fw [deleted file]
tools/XBMCLive/SDK/buildLive/build.sh
tools/XBMCLive/SDK/buildWithOptions.sh
tools/XBMCLive/SDK/liveOnlyHook.sh
tools/XBMCLive/SDK/nvidiaOnlyHook.sh
tools/XBMCLive/installXBMCFromISO.sh
tools/XBMCLive/xbmc-live.conf
xbmc/Application.cpp
xbmc/ButtonTranslator.cpp
xbmc/FileSystem/FileCurl.cpp
xbmc/GUIDialogAccessPoints.cpp
xbmc/GUIDialogFileBrowser.cpp
xbmc/GUIDialogGamepad.cpp
xbmc/GUIDialogKeyboard.cpp
xbmc/GUIDialogMediaSource.cpp
xbmc/GUIDialogMusicOSD.cpp
xbmc/GUIDialogNetworkSetup.cpp
xbmc/GUIDialogNumeric.cpp
xbmc/GUIDialogPictureInfo.cpp
xbmc/GUIDialogPluginSettings.cpp
xbmc/GUIDialogProgress.cpp
xbmc/GUIDialogSeekBar.cpp
xbmc/GUIDialogSettings.cpp
xbmc/GUIDialogSlider.cpp
xbmc/GUIDialogSmartPlaylistEditor.cpp
xbmc/GUIDialogSmartPlaylistRule.cpp
xbmc/GUIDialogSongInfo.cpp
xbmc/GUIDialogTeletext.cpp
xbmc/GUIDialogVideoSettings.cpp
xbmc/GUIDialogVolumeBar.cpp
xbmc/GUIDialogYesNo.cpp
xbmc/GUIMediaWindow.cpp
xbmc/GUIWindowFileManager.cpp
xbmc/GUIWindowFullScreen.cpp
xbmc/GUIWindowLoginScreen.cpp
xbmc/GUIWindowMusicBase.cpp
xbmc/GUIWindowMusicNav.cpp
xbmc/GUIWindowMusicPlaylist.cpp
xbmc/GUIWindowMusicPlaylistEditor.cpp
xbmc/GUIWindowMusicSongs.cpp
xbmc/GUIWindowOSD.cpp
xbmc/GUIWindowScripts.cpp
xbmc/GUIWindowScriptsInfo.cpp
xbmc/GUIWindowSettings.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowSettingsProfile.cpp
xbmc/GUIWindowSettingsScreenCalibration.cpp
xbmc/GUIWindowSlideShow.cpp
xbmc/GUIWindowSystemInfo.cpp
xbmc/GUIWindowTestPattern.cpp
xbmc/GUIWindowVideoBase.cpp
xbmc/GUIWindowVideoFiles.cpp
xbmc/GUIWindowVideoNav.cpp
xbmc/GUIWindowVideoPlaylist.cpp
xbmc/GUIWindowVisualisation.cpp
xbmc/GUIWindowWeather.cpp
xbmc/WinEventsSDL.cpp
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.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/DVDMessage.h
xbmc/cores/dvdplayer/DVDMessageQueue.cpp
xbmc/cores/dvdplayer/DVDMessageQueue.h
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.h
xbmc/karaoke/GUIDialogKaraokeSongSelector.cpp
xbmc/karaoke/GUIWindowKaraokeLyrics.cpp
xbmc/lib/libGoAhead/XBMChttp.cpp
xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.cpp
xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
xbmc/lib/libPython/xbmcmodule/action.cpp
xbmc/lib/libPython/xbmcmodule/player.cpp
xbmc/linux/XThreadUtils.cpp
xbmc/osx/Info.plist
xbmc/osx/eprintf.cpp
xbmc/settings/VideoSettings.h
xbmc/utils/Builtins.cpp
xbmc/utils/EventServer.cpp
xbmc/utils/Teletext.cpp