Merge remote branch 'origin/trunk' into gpl-compat
authorceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 4 Jan 2010 18:22:41 +0000 (18:22 +0000)
committerceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 4 Jan 2010 18:22:41 +0000 (18:22 +0000)
commitea90636eb2f78cd880c1e107dad41648970d63dc
tree4d7246b88c2bd6663f0ead7f15b7a353e9d159dc
parent3944ca41d387b1ef411f245764a7ebdfee26c8b4
Merge remote branch 'origin/trunk' into gpl-compat

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gpl-compat@26368 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
45 files changed:
guilib/D3DResource.cpp
guilib/GUIDialog.cpp
guilib/GUIDialog.h
guilib/GUIFontTTF.cpp
guilib/GUIFontTTF.h
xbmc/ApplicationMessenger.cpp
xbmc/ApplicationMessenger.h
xbmc/FileSystem/CMythDirectory.cpp
xbmc/FileSystem/CMythDirectory.h
xbmc/FileSystem/CMythFile.cpp
xbmc/GUIDialogSelect.cpp
xbmc/GUIDialogSelect.h
xbmc/cores/VideoRenderers/WinRenderer.cpp
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/avcodec.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.c
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDFileInfo.cpp
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
xbmc/cores/dvdplayer/Edl.cpp
xbmc/karaoke/karaokelyricstextustar.cpp
xbmc/lib/libPython/Python/Lib/email/Charset.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/Encoders.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/Errors.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/FeedParser.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/Generator.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/Header.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/Iterators.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/MIMEAudio.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/MIMEBase.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/MIMEImage.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/MIMEMessage.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/MIMEMultipart.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/MIMENonMultipart.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/MIMEText.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/Message.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/Parser.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/Utils.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/__init__.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/_parseaddr.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/base64MIME.py [deleted file]
xbmc/lib/libPython/Python/Lib/email/quopriMIME.py [deleted file]
xbmc/win32/WINFileSMB.cpp