merge with trunk. revision 12977
authorvulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 13 May 2008 09:10:09 +0000 (09:10 +0000)
committervulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 13 May 2008 09:10:09 +0000 (09:10 +0000)
commitd7f1d0c4e1d53cc6f4363d92c825f45397812678
tree348990b1c598bde24f283a7e738301fa78545e8e
parentfc6e5014895a19bcdde8d95e82260e30beffc894
merge with trunk. revision 12977

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport@12978 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
XBMC/guilib/GUIBaseContainer.cpp
XBMC/guilib/GUIBaseContainer.h
XBMC/guilib/GUIFadeLabelControl.cpp
XBMC/guilib/GUIFontTTF.cpp
XBMC/guilib/freetype2/include/freetype/ftoutln.h [new file with mode: 0644]
XBMC/guilib/freetype2/include/freetype/ftsynth.h [deleted file]
XBMC/system/scrapers/video/imdb.xml
XBMC/xbmc/cores/DllLoader/exports/emu_kernel32.cpp
XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.cpp