merged: Revisions 9635 -> 9702 changes from trunk.
authorjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 26 Jul 2007 01:29:55 +0000 (01:29 +0000)
committerjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 26 Jul 2007 01:29:55 +0000 (01:29 +0000)
commit234d2278fd9f85958af6c7fcd80ea9e7af05ad5f
tree0914e6c531e02c719389a3b0ee45c5f35596358f
parent9d39e79a7efb4a6ba42bb322cee94cf7d5b03970
merged: Revisions 9635 -> 9702 changes from trunk.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport@9704 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
130 files changed:
XBMC/guilib/GUIBaseContainer.cpp
XBMC/guilib/GUIBaseContainer.h
XBMC/guilib/GUIControl.cpp
XBMC/guilib/GUIControl.h
XBMC/guilib/GUIControlGroup.cpp
XBMC/guilib/GUIControlGroup.h
XBMC/guilib/GUIControlGroupList.cpp
XBMC/guilib/GUIFontManager.cpp
XBMC/guilib/GUIFontManager.h
XBMC/guilib/GUIFontTTF.cpp
XBMC/guilib/GUIFontXPR.cpp [deleted file]
XBMC/guilib/GUIMoverControl.cpp
XBMC/guilib/GUIMultiImage.cpp
XBMC/guilib/GUIMultiImage.h
XBMC/guilib/GUISound.cpp
XBMC/guilib/GUISpinControl.cpp
XBMC/guilib/GUIVideoControl.cpp
XBMC/guilib/GUIVisualisationControl.cpp
XBMC/guilib/GUIWindow.h
XBMC/guilib/GraphicContext.cpp
XBMC/guilib/GraphicContext.h
XBMC/guilib/GuiControlFactory.cpp
XBMC/guilib/GuiFontXPR.h [deleted file]
XBMC/guilib/Surface.cpp
XBMC/guilib/common/DirectInputKeyboard.cpp
XBMC/guilib/common/xbfont.cpp [deleted file]
XBMC/guilib/common/xbfont.h [deleted file]
XBMC/guilib/guilib.vcproj
XBMC/guilib/guilib_win32.vcproj
XBMC/guilib/system.h
XBMC/language/Danish/strings.xml
XBMC/language/English/strings.xml
XBMC/screensavers/Pyro.xbs
XBMC/screensavers/cpBlobs.xbs
XBMC/screensavers/pmBlobs.xbs
XBMC/skin/Project Mayhem III/1080i/Font.xml
XBMC/skin/Project Mayhem III/720p/Font.xml
XBMC/skin/Project Mayhem III/NTSC/Font.xml
XBMC/skin/Project Mayhem III/NTSC16x9/Font.xml
XBMC/skin/Project Mayhem III/PAL/DialogAlbumInfo.xml
XBMC/skin/Project Mayhem III/PAL/DialogFavourites.xml
XBMC/skin/Project Mayhem III/PAL/DialogScriptInfo.xml
XBMC/skin/Project Mayhem III/PAL/DialogSelect.xml
XBMC/skin/Project Mayhem III/PAL/DialogVideoInfo.xml
XBMC/skin/Project Mayhem III/PAL/Font.xml
XBMC/skin/Project Mayhem III/PAL/Home.xml
XBMC/skin/Project Mayhem III/PAL/LoginScreen.xml
XBMC/skin/Project Mayhem III/PAL/MyBuddies.xml
XBMC/skin/Project Mayhem III/PAL/MyGameSaves.xml
XBMC/skin/Project Mayhem III/PAL/MyMusicNav.xml
XBMC/skin/Project Mayhem III/PAL/MyMusicPlaylist.xml
XBMC/skin/Project Mayhem III/PAL/MyMusicPlaylistEditor.xml
XBMC/skin/Project Mayhem III/PAL/MyMusicSongs.xml
XBMC/skin/Project Mayhem III/PAL/MyPics.xml
XBMC/skin/Project Mayhem III/PAL/MyPrograms.xml
XBMC/skin/Project Mayhem III/PAL/MyScripts.xml
XBMC/skin/Project Mayhem III/PAL/MyVideo.xml
XBMC/skin/Project Mayhem III/PAL/MyVideoNav.xml
XBMC/skin/Project Mayhem III/PAL/MyVideoPlaylist.xml
XBMC/skin/Project Mayhem III/PAL/MyWeather.xml
XBMC/skin/Project Mayhem III/PAL/Settings.xml
XBMC/skin/Project Mayhem III/PAL/SettingsCategory.xml
XBMC/skin/Project Mayhem III/PAL/SettingsProfile.xml
XBMC/skin/Project Mayhem III/PAL/SettingsSystemInfo.xml
XBMC/skin/Project Mayhem III/PAL/SmartPlaylistRule.xml
XBMC/skin/Project Mayhem III/PAL/custom2_SkinSettings.xml
XBMC/skin/Project Mayhem III/PAL16x9/3D_CoverView.xml [new file with mode: 0644]
XBMC/skin/Project Mayhem III/PAL16x9/DialogAlbumInfo.xml
XBMC/skin/Project Mayhem III/PAL16x9/DialogVideoInfo.xml
XBMC/skin/Project Mayhem III/PAL16x9/Font.xml
XBMC/skin/Project Mayhem III/PAL16x9/Home.xml
XBMC/skin/Project Mayhem III/PAL16x9/LoginScreen.xml
XBMC/skin/Project Mayhem III/PAL16x9/MusicVisualisation.xml
XBMC/skin/Project Mayhem III/PAL16x9/Settings.xml
XBMC/skin/Project Mayhem III/fonts/FrancophilSans.ttf [new file with mode: 0644]
XBMC/skin/Project Mayhem III/fonts/FrancophilSans_readme.txt [new file with mode: 0644]
XBMC/skin/Project Mayhem III/fonts/common-font10-1080i.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/common-font10-720p.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/common-font10.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/common-font12-1080i.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/common-font12-720p.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/common-font12.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/common-font13-1080i.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/common-font13-720p.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/common-font13.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/special-bold-1080i.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/special-bold-720p.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/special-bold-pal.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/special-bold.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/special-normal-1080i.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/special-normal-720p.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/special-normal-pal.xpr [deleted file]
XBMC/skin/Project Mayhem III/fonts/special-normal.xpr [deleted file]
XBMC/skin/Project Mayhem III/media/Home_Top_16x9.png
XBMC/xbmc.sln
XBMC/xbmc/DateTime.cpp
XBMC/xbmc/DateTime.h
XBMC/xbmc/FileSystem/ShoutcastDirectory.cpp
XBMC/xbmc/GUIDialogContentSettings.cpp
XBMC/xbmc/GUIDialogFavourites.cpp
XBMC/xbmc/GUIDialogSeekBar.cpp
XBMC/xbmc/GUIDialogSeekBar.h
XBMC/xbmc/GUIDialogSelect.cpp
XBMC/xbmc/GUIDialogSelect.h
XBMC/xbmc/GUIDialogSmartPlaylistRule.cpp
XBMC/xbmc/GUIDialogVideoBookmarks.cpp
XBMC/xbmc/GUIWindowMusicBase.cpp
XBMC/xbmc/GUIWindowSettingsCategory.cpp
XBMC/xbmc/GUIWindowSettingsScreenCalibration.cpp
XBMC/xbmc/GUIWindowSettingsScreenCalibration.h
XBMC/xbmc/GUIWindowSystemInfo.cpp
XBMC/xbmc/GUIWindowVideoBase.cpp
XBMC/xbmc/GUIWindowVideoFiles.cpp
XBMC/xbmc/Id3Tag.cpp
XBMC/xbmc/MusicDatabase.cpp
XBMC/xbmc/MusicInfoScanner.cpp
XBMC/xbmc/MusicInfoTagLoaderMP4.cpp
XBMC/xbmc/MusicInfoTagLoaderWMA.cpp
XBMC/xbmc/Settings.cpp
XBMC/xbmc/Settings.h
XBMC/xbmc/StringUtils.cpp
XBMC/xbmc/StringUtils.h
XBMC/xbmc/VorbisTag.cpp
XBMC/xbmc/lib/UnrarXLib/os.hpp
XBMC/xbmc/lib/UnrarXLib/raros.hpp
XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
XBMC/xbmc/utils/GUIInfoManager.cpp
XBMC/xbmc/utils/GUIInfoManager.h
XBMC/xbmc/utils/SystemInfo.cpp
XBMC/xbmc/xbox/IoSupport.cpp