merge with trunk. rev. 13012.
authorvulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 14 May 2008 22:21:27 +0000 (22:21 +0000)
committervulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 14 May 2008 22:21:27 +0000 (22:21 +0000)
commitc024904a7797c1ccec7ff55d3daa428d78ee0bb7
tree6ed5da0f199074d1cffc32fee30eb56c9ad9219e
parent944c64edb7b9519854a0f0ca91067ed856ba5d7b
merge with trunk. rev. 13012.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport@13013 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
XBMC/guilib/GUIFadeLabelControl.cpp
XBMC/guilib/common/DirectInputKeyboard.cpp
XBMC/xbmc/Settings.cpp
XBMC/xbmc/cores/VideoRenderers/WinRenderer.cpp
XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp