Merge remote branch 'origin/trunk' into fhs
authorceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 13 May 2010 01:12:24 +0000 (01:12 +0000)
committerceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 13 May 2010 01:12:24 +0000 (01:12 +0000)
commitfa41b5127563a91e73813705200250ca6b4603b8
tree23d5a1b02b03ebae0b6afd9f31365c02a231c374
parentd45efb5edcf409e84352752418c4ae3009ffc681
Merge remote branch 'origin/trunk' into fhs

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/fhs@30090 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
204 files changed:
.gitignore
Makefile.in
XBMC.xcodeproj/project.pbxproj
addons/skin.confluence/720p/DialogAddonInfo.xml
addons/skin.confluence/720p/DialogScriptInfo.xml [deleted file]
addons/skin.confluence/720p/DialogTextViewer.xml [new file with mode: 0644]
addons/skin.confluence/720p/includes.xml
addons/skin.pm3-hd/720p/DialogAddonInfo.xml
addons/skin.pm3-hd/720p/DialogScriptInfo.xml [deleted file]
addons/skin.pm3-hd/720p/DialogTextViewer.xml [new file with mode: 0644]
addons/skin.pm3-hd/720p/Home.xml
addons/skin.pm3-hd/720p/MyMusicNav.xml
addons/skin.pm3-hd/720p/MyVideoNav.xml
addons/skin.pm3-hd/720p/ViewsFileMode.xml
addons/skin.pm3-hd/720p/custom_SkinSetting_1111.xml
addons/skin.pm3-hd/720p/includes.xml
bootstrap
configure.in
gitrev.sh
guilib/AudioContext.cpp
guilib/D3DResource.cpp
guilib/D3DResource.h
guilib/GUIVisualisationControl.cpp
guilib/Key.h
guilib/system.h
language/Chinese (Simple)/strings.xml
language/English/strings.xml
lib/cpluff/libcpluff/win32/cpluff.vcproj
lib/libass/COPYING [new file with mode: 0644]
lib/libass/Changelog [new file with mode: 0644]
lib/libass/Makefile.am [new file with mode: 0644]
lib/libass/Makefile.in [new file with mode: 0644]
lib/libass/aclocal.m4 [new file with mode: 0644]
lib/libass/compile [new file with mode: 0755]
lib/libass/config.guess [new file with mode: 0755]
lib/libass/config.h.in [new file with mode: 0644]
lib/libass/config.sub [new file with mode: 0755]
lib/libass/configure [new file with mode: 0755]
lib/libass/configure.ac [new file with mode: 0644]
lib/libass/depcomp [new file with mode: 0755]
lib/libass/install-sh [new file with mode: 0755]
lib/libass/libass.pc.in [new file with mode: 0644]
lib/libass/libass/Makefile.am [new file with mode: 0644]
lib/libass/libass/Makefile.in [new file with mode: 0644]
lib/libass/libass/ass.c [new file with mode: 0644]
lib/libass/libass/ass.h [new file with mode: 0644]
lib/libass/libass/ass_bitmap.c [new file with mode: 0644]
lib/libass/libass/ass_bitmap.h [new file with mode: 0644]
lib/libass/libass/ass_cache.c [new file with mode: 0644]
lib/libass/libass/ass_cache.h [new file with mode: 0644]
lib/libass/libass/ass_cache_template.h [new file with mode: 0644]
lib/libass/libass/ass_drawing.c [new file with mode: 0644]
lib/libass/libass/ass_drawing.h [new file with mode: 0644]
lib/libass/libass/ass_font.c [new file with mode: 0644]
lib/libass/libass/ass_font.h [new file with mode: 0644]
lib/libass/libass/ass_fontconfig.c [new file with mode: 0644]
lib/libass/libass/ass_fontconfig.h [new file with mode: 0644]
lib/libass/libass/ass_library.c [new file with mode: 0644]
lib/libass/libass/ass_library.h [new file with mode: 0644]
lib/libass/libass/ass_parse.c [new file with mode: 0644]
lib/libass/libass/ass_parse.h [new file with mode: 0644]
lib/libass/libass/ass_render.c [new file with mode: 0644]
lib/libass/libass/ass_render.h [new file with mode: 0644]
lib/libass/libass/ass_strtod.c [new file with mode: 0644]
lib/libass/libass/ass_types.h [new file with mode: 0644]
lib/libass/libass/ass_utils.c [new file with mode: 0644]
lib/libass/libass/ass_utils.h [new file with mode: 0644]
lib/libass/libass/libass.sym [new file with mode: 0644]
lib/libass/ltmain.sh [new file with mode: 0755]
lib/libass/missing [new file with mode: 0755]
lib/libass/shave/shave-libtool.in [new file with mode: 0644]
lib/libass/shave/shave.in [new file with mode: 0644]
lib/libass/shave/shave.m4 [new file with mode: 0644]
lib/libass/test/Makefile.am [new file with mode: 0644]
lib/libass/test/Makefile.in [new file with mode: 0644]
lib/libass/test/test.c [new file with mode: 0644]
lib/libass/xbmc/Makefile.in [new file with mode: 0644]
lib/libass/xbmc/libass_win32/config.h [new file with mode: 0644]
lib/libass/xbmc/libass_win32/getopt.h [new file with mode: 0644]
lib/libass/xbmc/libass_win32/inttypes.h [new file with mode: 0644]
lib/libass/xbmc/libass_win32/libass.def [new file with mode: 0644]
lib/libass/xbmc/libass_win32/libass_win32_vs2008.sln [new file with mode: 0644]
lib/libass/xbmc/libass_win32/libass_win32_vs2008.vcproj [new file with mode: 0644]
lib/libass/xbmc/libass_win32/libass_win32_vs2010.vcxproj [new file with mode: 0644]
lib/libass/xbmc/libass_win32/stdint.h [new file with mode: 0644]
lib/libass/xbmc/libass_win32/unistd.h [new file with mode: 0644]
lib/liblame/vc_solution/vc9_libmp3lame_dll.vcproj
project/BuildDependencies/scripts/fontconfig_d.bat
project/BuildDependencies/scripts/libexpat_d.bat
project/VS2008Express/XBMC for Windows.sln
project/VS2008Express/XBMC.vcproj
project/VS2010Express/XBMC for Windows.sln
project/VS2010Express/XBMC.vcxproj
project/VS2010Express/XBMC.vcxproj.filters
project/VS2010Express/guilib.vcxproj
tools/Linux/packaging/debian/rules
web/poc_jsonrpc/musicfiles.html
web/poc_jsonrpc/videofiles.html
xbmc/Application.cpp
xbmc/ApplicationMessenger.cpp
xbmc/ButtonTranslator.cpp
xbmc/GUIDialogAddonInfo.cpp
xbmc/GUIDialogAddonInfo.h
xbmc/GUIDialogAudioSubtitleSettings.cpp
xbmc/GUIDialogTextViewer.cpp [new file with mode: 0644]
xbmc/GUIDialogTextViewer.h [new file with mode: 0644]
xbmc/GUISettings.cpp
xbmc/GUISettings.h
xbmc/GUIWindowScripts.cpp
xbmc/GUIWindowScripts.h
xbmc/GUIWindowScriptsInfo.cpp [deleted file]
xbmc/GUIWindowScriptsInfo.h [deleted file]
xbmc/GUIWindowSettingsCategory.cpp
xbmc/Makefile.in
xbmc/MusicInfoTagLoaderCDDA.cpp
xbmc/PowerManager.cpp
xbmc/VideoReferenceClock.cpp
xbmc/addons/AddonManager.cpp
xbmc/cdrip/CDDARipper.cpp
xbmc/cdrip/DllLameenc.h
xbmc/cdrip/Encoder.h
xbmc/cdrip/EncoderFFmpeg.cpp [new file with mode: 0644]
xbmc/cdrip/EncoderFFmpeg.h [new file with mode: 0644]
xbmc/cdrip/EncoderLame.cpp
xbmc/cdrip/EncoderVorbis.cpp
xbmc/cdrip/Makefile [deleted file]
xbmc/cdrip/Makefile.in [new file with mode: 0644]
xbmc/cores/AudioRenderers/AudioRendererFactory.cpp
xbmc/cores/AudioRenderers/Win32WASAPI.cpp
xbmc/cores/VideoRenderers/LinuxRenderer.cpp
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
xbmc/cores/dvdplayer/Codecs/DllAvCodec.h
xbmc/cores/dvdplayer/Codecs/DllAvFormat.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oggenc.c
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/config.guess [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/config.sub [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/depcomp [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/install-sh [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/ltmain.sh [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/missing [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/Makefile.in [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/aclocal.m4 [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/doc/Makefile.in [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/Makefile.in [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/dvdcss/Makefile.in [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/test/Makefile.in [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/INSTALL
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/INSTALL
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
xbmc/cores/dvdplayer/Edl.cpp
xbmc/cores/paplayer/vgmstream/win32/win32.vcxproj
xbmc/lib/libass/COPYING [deleted file]
xbmc/lib/libass/Makefile.am [deleted file]
xbmc/lib/libass/autogen.sh [deleted file]
xbmc/lib/libass/configure.ac [deleted file]
xbmc/lib/libass/import.sh [deleted file]
xbmc/lib/libass/libass.pc.in [deleted file]
xbmc/lib/libass/libass/Makefile.am [deleted file]
xbmc/lib/libass/libass/ass.c [deleted file]
xbmc/lib/libass/libass/ass.h [deleted file]
xbmc/lib/libass/libass/ass_bitmap.c [deleted file]
xbmc/lib/libass/libass/ass_bitmap.h [deleted file]
xbmc/lib/libass/libass/ass_cache.c [deleted file]
xbmc/lib/libass/libass/ass_cache.h [deleted file]
xbmc/lib/libass/libass/ass_cache_template.h [deleted file]
xbmc/lib/libass/libass/ass_drawing.c [deleted file]
xbmc/lib/libass/libass/ass_drawing.h [deleted file]
xbmc/lib/libass/libass/ass_font.c [deleted file]
xbmc/lib/libass/libass/ass_font.h [deleted file]
xbmc/lib/libass/libass/ass_fontconfig.c [deleted file]
xbmc/lib/libass/libass/ass_fontconfig.h [deleted file]
xbmc/lib/libass/libass/ass_library.c [deleted file]
xbmc/lib/libass/libass/ass_library.h [deleted file]
xbmc/lib/libass/libass/ass_render.c [deleted file]
xbmc/lib/libass/libass/ass_types.h [deleted file]
xbmc/lib/libass/libass/ass_utils.c [deleted file]
xbmc/lib/libass/libass/ass_utils.h [deleted file]
xbmc/lib/libass/libass/help_mp.h [deleted file]
xbmc/lib/libass/libass/libass.sym [deleted file]
xbmc/lib/libass/libass/msvc.h [deleted file]
xbmc/lib/libass/libass_win32/config.h [deleted file]
xbmc/lib/libass/libass_win32/getopt.h [deleted file]
xbmc/lib/libass/libass_win32/inttypes.h [deleted file]
xbmc/lib/libass/libass_win32/libass_win32_vs2008.sln [deleted file]
xbmc/lib/libass/libass_win32/libass_win32_vs2008.vcproj [deleted file]
xbmc/lib/libass/libass_win32/libass_win32_vs2010.vcxproj [deleted file]
xbmc/lib/libass/libass_win32/libass_win32_vs2010.vcxproj.filters [deleted file]
xbmc/lib/libass/libass_win32/stdint.h [deleted file]
xbmc/lib/libass/libass_win32/unistd.h [deleted file]
xbmc/lib/libass/shave/shave-libtool.in [deleted file]
xbmc/lib/libass/shave/shave.in [deleted file]
xbmc/lib/libass/shave/shave.m4 [deleted file]
xbmc/lib/libass/test/Makefile.am [deleted file]
xbmc/lib/libass/test/test.c [deleted file]
xbmc/lib/libass/xbmc/Makefile.in [deleted file]
xbmc/lib/libjsonrpc/FileItemHandler.cpp
xbmc/lib/libjsonrpc/FileItemHandler.h
xbmc/osx/Makefile.in
xbmc/visualizations/Milkdrop/vis_milkdrop/pluginshell.cpp