merge with trunk. revision: 11119.
authorvulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sat, 29 Dec 2007 17:19:27 +0000 (17:19 +0000)
committervulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sat, 29 Dec 2007 17:19:27 +0000 (17:19 +0000)
commitf452ec6249d4b7f543a3f0e76de6056bb6c61c98
tree78635d0398b44b963a658342448bfb0acdc35530
parentb060c97e769e99db0e66217621d4b23233bda385
merge with trunk. revision: 11119.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC@11120 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
76 files changed:
guilib/GUIBaseContainer.cpp
guilib/GUIBaseContainer.h
guilib/GUIControl.cpp
guilib/GUIDialog.cpp
guilib/GUIFadeLabelControl.cpp
guilib/GUIFadeLabelControl.h
guilib/GUILargeImage.cpp
guilib/GUIListItemLayout.cpp
guilib/GUIListItemLayout.h
guilib/GUIListLabel.cpp
guilib/GUIMultiSelectText.cpp [new file with mode: 0644]
guilib/GUIMultiSelectText.h [new file with mode: 0644]
guilib/GUIWindow.cpp
guilib/GUIWindow.h
guilib/GuiControlFactory.cpp
guilib/Makefile
guilib/VisibleEffect.cpp
guilib/VisibleEffect.h
guilib/guiImage.cpp
guilib/guiImage.h
guilib/guilib.vcproj
guilib/guilib_win32.vcproj
language/English/strings.xml
language/Swedish/strings.xml
skin/Project Mayhem III/PAL/DialogAlbumInfo.xml
skin/Project Mayhem III/PAL/DialogVideoInfo.xml
skin/Project Mayhem III/PAL/Home.xml
skin/Project Mayhem III/PAL16x9/DialogAlbumInfo.xml
skin/Project Mayhem III/PAL16x9/DialogVideoInfo.xml
skin/Project Mayhem III/PAL16x9/Home.xml
system/players/mplayer/mplayer.dll
system/scrapers/video/ofdb.xml
tools/XBMCTex/AnimatedGif.cpp
tools/XBMCTex/AnimatedGif.h
tools/XBMCTex/Bundler.cpp
tools/XBMCTex/Bundler.h
tools/XBMCTex/XBMCTex.cpp
tools/XBMCTex/cmdlineargs.h
tools/XBMCTex/stdafx.h
tools/XBMCTex/xbox.cpp
userdata/LCD.xml
xbmc/Application.cpp
xbmc/Edl.cpp
xbmc/Favourites.cpp
xbmc/GUIDialogContextMenu.h
xbmc/GUIDialogSmartPlaylistEditor.cpp
xbmc/GUIWindowFullScreen.cpp
xbmc/GUIWindowMusicBase.cpp
xbmc/GUIWindowMusicInfo.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowVideoBase.cpp
xbmc/GUIWindowVideoNav.cpp
xbmc/GUIWindowVideoPlaylist.cpp
xbmc/MusicDatabase.cpp
xbmc/MusicInfoScanner.cpp
xbmc/PartyModeManager.cpp
xbmc/PartyModeManager.h
xbmc/Util.cpp
xbmc/VideoInfoScanner.cpp
xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp
xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp
xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.h
xbmc/lib/libGoAhead/XBMChttp.cpp
xbmc/lib/libGoAhead/XBMChttp.h
xbmc/lib/libGoAhead/XBMCweb.cpp
xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
xbmc/lib/libPython/xbmcmodule/listitem.cpp
xbmc/lib/libXenium/XeniumLCD.cpp
xbmc/lib/smartXX/smartxxlcd.cpp
xbmc/lib/x3lcd/x3lcd.cpp
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/GUIInfoManager.h
xbmc/utils/LCD.cpp
xbmc/utils/LCD.h
xbmc/utils/SystemInfo.cpp