Merge remote branch 'origin/trunk' into trac-8658
authorceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 25 Aug 2010 07:22:39 +0000 (07:22 +0000)
committerceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 25 Aug 2010 07:22:39 +0000 (07:22 +0000)
commit92121b92a5df36b2ced29df9c1edd498d94c4d1c
treecc8baaf247bea78e62d7812694348a2994e6ef8b
parentf34779d4e9a5a23677c5a319deffc94a684d51fe
Merge remote branch 'origin/trunk' into trac-8658

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/trac-8658@33124 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
17 files changed:
lib/libass/m4/.gitignore [new file with mode: 0644]
lib/libass/m4/libtool.m4 [deleted file]
lib/libass/m4/ltoptions.m4 [deleted file]
lib/libass/m4/ltsugar.m4 [deleted file]
lib/libass/m4/ltversion.m4 [deleted file]
lib/libass/m4/lt~obsolete.m4 [deleted file]
xbmc/FileSystem/AddonsDirectory.cpp
xbmc/FileSystem/DllLibCurl.cpp
xbmc/GUIViewStatePrograms.cpp
xbmc/GUIWindowPrograms.cpp
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.h
xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
xbmc/lib/libjsonrpc/AVPlayerOperations.cpp
xbmc/lib/libjsonrpc/AVPlayerOperations.h
xbmc/lib/libjsonrpc/AVPlaylistOperations.cpp
xbmc/lib/libjsonrpc/JSONRPC.cpp