Merge remote branch 'origin/trunk' into trac-8658 trac-8658
authorceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 30 Aug 2010 06:06:23 +0000 (06:06 +0000)
committerceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 30 Aug 2010 06:06:23 +0000 (06:06 +0000)
commit144a2dd02994448b0e37dce69eec290f7b69a3c7
tree9e5e8259ce7d142682c078e3fd248f9665b02745
parent60dc9fe819e0ebcb0c358efcb0ede7c60679f8b6
Merge remote branch 'origin/trunk' into trac-8658

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/trac-8658@33333 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
17 files changed:
language/Chinese (Simple)/strings.xml
project/BuildDependencies/DownloadMingwBuildEnv.bat [new file with mode: 0644]
project/BuildDependencies/scripts/dlextract.bat
project/BuildDependencies/scripts/get_mingw_env.bat [new file with mode: 0644]
project/BuildDependencies/scripts/get_mingw_env.txt [new file with mode: 0644]
project/BuildDependencies/scripts/get_msys_env.bat [new file with mode: 0644]
project/BuildDependencies/scripts/get_msys_env.txt [new file with mode: 0644]
project/BuildDependencies/scripts/librtmp_d.bat
xbmc/FileItem.cpp
xbmc/FileSystem/RSSDirectory.cpp
xbmc/GUIDialogProfileSettings.cpp
xbmc/GUIWindowVideoFiles.cpp
xbmc/RenderSystemDX.cpp
xbmc/RenderSystemDX.h
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.cpp
xbmc/lib/libPython/XBPyThread.cpp
xbmc/lib/libjsonrpc/FileItemHandler.cpp