[XBOX] merged: mainline/trunk revisions
authorarnova <arnova@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 31 Mar 2010 10:33:33 +0000 (10:33 +0000)
committerarnova <arnova@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 31 Mar 2010 10:33:33 +0000 (10:33 +0000)
commitf85ae3afa6e9036c307aedbf4da3ae1fe5f27811
treefb61a4676f2cd9d5cb6f5b59bb0dc9de0733807a
parent177dbf7f793043ff353f23a0be6c992403eade9e
[XBOX] merged: mainline/trunk revisions
28499,28545,28548,28549,28555,28556,28557,28572,28608,28623,28631,28638,28639
28641,28642,28648,28670,28692,28693,28698,28703,28704,28715,28762,28764,28768
28773,28783,28785,28793,28800,28813,28815,28829,28870,28871,28921

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/xbox@28940 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
40 files changed:
guilib/GUIFixedListContainer.cpp
guilib/GUIListContainer.cpp
guilib/GUIListGroup.cpp
guilib/GUIPanelContainer.cpp
guilib/GUISliderControl.cpp
guilib/GUISliderControl.h
guilib/GUIWrappingListContainer.cpp
guilib/XMLUtils.cpp
guilib/XMLUtils.h
xbmc/AdvancedSettings.cpp
xbmc/Application.cpp
xbmc/FileItem.cpp
xbmc/FileSystem/FileFactory.cpp
xbmc/FileSystem/HTSPDirectory.cpp
xbmc/FileSystem/HTSPSession.cpp
xbmc/FileSystem/HTSPSession.h
xbmc/FileSystem/VirtualDirectory.cpp
xbmc/FileSystem/VirtualDirectory.h
xbmc/GUIDialogContentSettings.cpp
xbmc/GUIMediaWindow.cpp
xbmc/GUIWindowFileManager.cpp
xbmc/GUIWindowSlideShow.cpp
xbmc/GUIWindowVideoFiles.cpp
xbmc/GUIWindowVideoInfo.cpp
xbmc/GUIWindowVideoNav.cpp
xbmc/PlayListPLS.cpp
xbmc/PlayListPLS.h
xbmc/SmartPlaylist.cpp
xbmc/Util.cpp
xbmc/Util.h
xbmc/VideoDatabase.cpp
xbmc/VideoDatabase.h
xbmc/VideoInfoScanner.cpp
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/apedec.c
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/paplayer/FLACcodec.cpp
xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
xbmc/lib/sqLite/sqlitedataset.cpp
xbmc/utils/GUIInfoManager.cpp