Merge remote branch 'origin/trunk' into fhs
authorceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 13 May 2010 17:51:20 +0000 (17:51 +0000)
committerceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 13 May 2010 17:51:20 +0000 (17:51 +0000)
commitb07f302ca7103b54b6658ba291f6d3ff09519687
tree3751f3d71bc593b2bb7ebd5df39a54ae3ae14045
parentfa41b5127563a91e73813705200250ca6b4603b8
Merge remote branch 'origin/trunk' into fhs

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/fhs@30127 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
91 files changed:
addons/skin.confluence/addon.xml
addons/skin.confluence/description.xml
addons/skin.confluence/skin.xml [deleted file]
addons/skin.pm3-hd/720p/MyVideoNav.xml
addons/skin.pm3-hd/720p/ViewsVideoLibrary.xml
addons/skin.pm3-hd/720p/custom_SkinSetting_1111.xml
addons/skin.pm3-hd/720p/includes.xml
addons/skin.pm3-hd/addon.xml
addons/skin.pm3-hd/description.xml
addons/skin.pm3-hd/language/English/strings.xml
addons/skin.pm3-hd/skin.xml [deleted file]
configure.in
guilib/AnimatedGif.h
guilib/GUIRenderingControl.cpp
guilib/TextureBundleXPR.cpp
guilib/common/LIRC.cpp
guilib/common/LIRC.h
guilib/common/SDLJoystick.cpp
guilib/common/SDLJoystick.h
language/Chinese (Simple)/strings.xml
lib/enca/libenca_win32/libenca_win32.vcxproj
lib/freetype/builds/win32/vs2010/freetype.vcxproj
lib/fribidi/libfridibidi/libfridibidi.vcxproj
lib/libass/Makefile.in [deleted file]
lib/libass/aclocal.m4 [deleted file]
lib/libass/compile [deleted file]
lib/libass/config.guess [deleted file]
lib/libass/config.h.in [deleted file]
lib/libass/config.sub [deleted file]
lib/libass/configure [deleted file]
lib/libass/depcomp [deleted file]
lib/libass/install-sh [deleted file]
lib/libass/libass/Makefile.in [deleted file]
lib/libass/ltmain.sh [deleted file]
lib/libass/missing [deleted file]
lib/libass/test/Makefile.in [deleted file]
lib/libass/xbmc/libass_win32/libass_win32_vs2010.vcxproj
lib/libcdio/libcdio.vcxproj
lib/libiconv/libiconv_win32/libiconv_win32.vcxproj
lib/libmodplug/libmodplug_2010.vcxproj
lib/pcre/libpcre/libpcre.vcxproj
project/VS2010Express/UnrarXLib.vcxproj
project/VS2010Express/XBMC for Windows.props [new file with mode: 0644]
project/VS2010Express/XBMC.vcxproj
project/VS2010Express/guilib.vcxproj
project/VS2010Express/libPlatinum.vcxproj
tools/Linux/packaging/debian/copyright
xbmc/cdrip/DllLameenc.h
xbmc/cores/dvdplayer/Codecs/libdts/vc++/libdts.vcxproj
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/INSTALL [deleted file]
xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/INSTALL [deleted file]
xbmc/cores/dvdplayer/Codecs/libfaad2/libfaad/libfaad2_dll.vcxproj
xbmc/cores/dvdplayer/Codecs/libmad/msvc++/libmad.vcxproj
xbmc/cores/paplayer/AC3Codec/vc++/AC3Codec.vcxproj
xbmc/cores/paplayer/ADPCMCodec/adpcm.vcxproj
xbmc/cores/paplayer/MP3codec.cpp
xbmc/cores/paplayer/NSFCodec/NoseFartXBMC.vcxproj
xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/libsidplay.vcxproj
xbmc/cores/paplayer/WavPackCodec/wavpackdll.vcxproj
xbmc/cores/paplayer/YMCodec/StSoundLibrary/StSoundLibrary.vcxproj
xbmc/cores/paplayer/vgmstream/win32/win32.vcxproj
xbmc/cores/paplayer/vorbisfile/libvorbis/win32/VS2010/libvorbis/libvorbis.vcxproj
xbmc/cores/paplayer/vorbisfile/libvorbis/win32/VS2010/libvorbisfile/libvorbisfile.vcxproj
xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg_static.vcxproj
xbmc/lib/cmyth/Win32/libcmyth.vcxproj
xbmc/lib/cximage-6.0/ImageLib.vcxproj
xbmc/lib/cximage-6.0/jasper/jasper.vcxproj
xbmc/lib/cximage-6.0/jbig/jbig.vcxproj
xbmc/lib/cximage-6.0/jpeg/Jpeg.vcxproj
xbmc/lib/cximage-6.0/mng/mng.vcxproj
xbmc/lib/cximage-6.0/png/png.vcxproj
xbmc/lib/cximage-6.0/raw/libdcr.vcxproj
xbmc/lib/cximage-6.0/tiff/Tiff.vcxproj
xbmc/lib/cximage-6.0/zlib/zlib.vcxproj
xbmc/lib/libRTV/libRTV.vcxproj
xbmc/lib/libXBMS/libXBMS/libXBMS.vcxproj
xbmc/lib/libXDAAP/libXDAAP_win32/libXDAAP_win32.vcxproj
xbmc/lib/libapetag/libapetag.vcxproj
xbmc/lib/libexif/libexif.vcxproj
xbmc/lib/libhts/Win32/libhts_2010.vcxproj
xbmc/lib/libid3tag/libid3tag/msvc++/libid3tag.vcxproj
xbmc/lib/libmms/glib-2.20.4/build/win32/vs10/glib.vcxproj
xbmc/lib/libmms/libmms_win32/msvc++/libmms.vcxproj
xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcxproj
xbmc/lib/libshout/libshout/libshout.vcxproj
xbmc/lib/libsquish/vs7/squish/squish_2010.vcxproj
xbmc/lib/sqLite/sqlite/libsqlite_win32/libsqlite_win32.vcxproj
xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj
xbmc/visualizations/Milkdrop/Plugin.vcxproj
xbmc/visualizations/WaveForm/Waveform.vcxproj