merged: linuxport revisions up to 14050. Actual revs merged: 13853,854,858,859,862...
authorjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 13 Jul 2008 23:42:22 +0000 (23:42 +0000)
committerjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 13 Jul 2008 23:42:22 +0000 (23:42 +0000)
commit1211be8346b2aa94076ac680da5b6440e97adbea
treecfd2ffa235812ca8ca5c5a5a5578128367cd3a70
parentb9dce7a06ff7e0ed1a841880d8a76621cd532d7a
merged: linuxport revisions up to 14050.  Actual revs merged: 13853,854,858,859,862-864,866,871,872,874,881,895,911-922,938,939,941,955,957,958,960-962,964,970,973,974,978,985,986,989,993,994,997,998,14006,009,013,014,016,020-024,026,029-032,034-036.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk/XBMC@14051 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
120 files changed:
guilib/GUIBaseContainer.cpp
guilib/GUIBorderedImage.cpp
guilib/GUIBorderedImage.h
guilib/GUIButtonControl.cpp
guilib/GUIButtonControl.h
guilib/GUIButtonScroller.cpp
guilib/GUIButtonScroller.h
guilib/GUIControl.cpp
guilib/GUIControl.h
guilib/GUIControlGroup.h
guilib/GUIEditControl.cpp
guilib/GUIEditControl.h
guilib/GUIFadeLabelControl.cpp
guilib/GUIFadeLabelControl.h
guilib/GUILabelControl.cpp
guilib/GUILabelControl.h
guilib/GUILargeImage.cpp
guilib/GUIListGroup.cpp [new file with mode: 0644]
guilib/GUIListGroup.h [new file with mode: 0644]
guilib/GUIListItem.cpp
guilib/GUIListItem.h
guilib/GUIListItemLayout.cpp
guilib/GUIListItemLayout.h
guilib/GUIListLabel.cpp
guilib/GUIListLabel.h
guilib/GUIMessage.cpp
guilib/GUIMessage.h
guilib/GUIMoverControl.cpp
guilib/GUIMoverControl.h
guilib/GUIMultiSelectText.cpp
guilib/GUIMultiSelectText.h
guilib/GUIRadioButtonControl.cpp
guilib/GUIRadioButtonControl.h
guilib/GUIResizeControl.cpp
guilib/GUIResizeControl.h
guilib/GUIScrollBarControl.cpp
guilib/GUISelectButtonControl.cpp
guilib/GUISelectButtonControl.h
guilib/GUISettingsSliderControl.cpp
guilib/GUISettingsSliderControl.h
guilib/GUISliderControl.cpp
guilib/GUISliderControl.h
guilib/GUISpinControlEx.cpp
guilib/GUITextLayout.cpp
guilib/GUITextLayout.h
guilib/GUIToggleButtonControl.cpp
guilib/GUIToggleButtonControl.h
guilib/GuiControlFactory.cpp
guilib/GuiControlFactory.h
guilib/VisibleEffect.cpp
guilib/guiImage.cpp
guilib/guiImage.h
guilib/guilib.vcproj
guilib/guilib_win32.vcproj
guilib/system.h
language/English (US)/langinfo.xml [new file with mode: 0644]
language/English (US)/strings.xml [new file with mode: 0644]
language/English/strings.xml
xbmc/Application.cpp
xbmc/Database.cpp
xbmc/FileSystem/Directory.cpp
xbmc/FileSystem/FactoryFileDirectory.cpp
xbmc/FileSystem/FileRTV.cpp
xbmc/FileSystem/FileRTV.h
xbmc/FileSystem/IDirectory.cpp
xbmc/FileSystem/IDirectory.h
xbmc/FileSystem/MultiPathDirectory.cpp
xbmc/FileSystem/MusicDatabaseDirectory.cpp
xbmc/FileSystem/StackDirectory.cpp
xbmc/FileSystem/StackDirectory.h
xbmc/FileSystem/VideoDatabaseDirectory.cpp
xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
xbmc/FileSystem/VirtualPathDirectory.cpp
xbmc/GUIDialogFileBrowser.cpp
xbmc/GUIDialogProfileSettings.cpp
xbmc/GUIDialogSmartPlaylistRule.cpp
xbmc/GUIDialogSongInfo.cpp
xbmc/GUIDialogVideoBookmarks.cpp
xbmc/GUILargeTextureManager.cpp
xbmc/GUIMediaWindow.cpp
xbmc/GUISettings.cpp
xbmc/GUIViewStateVideo.cpp
xbmc/GUIWindowMusicBase.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowVideoInfo.cpp
xbmc/GUIWindowVideoNav.cpp
xbmc/GUIWindowVideoNav.h
xbmc/KaiItem.cpp
xbmc/LangCodeExpander.cpp
xbmc/LastFmManager.cpp
xbmc/PlayListPlayer.cpp
xbmc/ProgramDatabase.cpp
xbmc/Settings.cpp
xbmc/Util.cpp
xbmc/VideoDatabase.cpp
xbmc/VideoDatabase.h
xbmc/VideoInfoScanner.cpp
xbmc/cores/DllLoader/dll_tracker.cpp
xbmc/cores/DllLoader/dll_tracker.h
xbmc/cores/DllLoader/dll_tracker_memory.cpp
xbmc/cores/DllLoader/exports/emu_socket.cpp
xbmc/cores/DllLoader/exports/emu_socket/getaddrinfo.c
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
xbmc/cores/paplayer/CodecFactory.cpp
xbmc/lib/libGoAhead/WebServer.cpp
xbmc/lib/libGoAhead/XBMChttp.cpp
xbmc/lib/libPython/XBPython.cpp
xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.h
xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
xbmc/lib/libRTMP/AMFObject.cpp
xbmc/lib/libRTV/interface.h
xbmc/lib/libscrobbler/scrobbler.cpp
xbmc/stdafx.h
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/GUIInfoManager.h
xbmc/utils/KaiClient.cpp
xbmc/utils/Socket.cpp