[XBOX] merged: mainline/trunk revisions
authorarnova <arnova@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 9 May 2010 16:17:02 +0000 (16:17 +0000)
committerarnova <arnova@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 9 May 2010 16:17:02 +0000 (16:17 +0000)
commit0642b04520d9c9e7fad8f449c7089a69933ab7e9
treec015d22f06a5d86e7cbb1b482ea4ed2a54428ea3
parent3782e9663186f7e98b78afda875c592981b3cd09
[XBOX] merged: mainline/trunk revisions
26154,28378,28898,28937,28952,29036,29159,29189,29194,29210,29233,29246,29247
29263,29286,29315,29318,29345,29365,29369,29452,29479,29489,29494,29676
29834-29836,29918

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/xbox@29950 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
27 files changed:
guilib/GUIControl.cpp
guilib/GUITexture.cpp
language/Chinese (Simple)/strings.xml
xbmc/FileSystem/DAVDirectory.cpp
xbmc/FileSystem/FileCurl.cpp
xbmc/FileSystem/FileCurl.h
xbmc/FileSystem/FileShoutcast.cpp
xbmc/FileSystem/HDDirectory.cpp
xbmc/FileSystem/IDirectory.cpp
xbmc/FileSystem/SMBDirectory.cpp
xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp
xbmc/GUIWindowVideoInfo.cpp
xbmc/GUIWindowVideoNav.cpp
xbmc/SmartPlaylist.cpp
xbmc/ThumbLoader.cpp
xbmc/UPnP.cpp
xbmc/VideoDatabase.cpp
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.h
xbmc/cores/dvdplayer/DVDFileInfo.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h
xbmc/utils/ScraperParser.cpp