merged: r18133,18171 from linuxport branch.
authorjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 12 Mar 2009 22:40:41 +0000 (22:40 +0000)
committerjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 12 Mar 2009 22:40:41 +0000 (22:40 +0000)
commit5c630c56462297b359208dafd58962570e9eb63b
treefe534173b06f84278044f828cd8b997d0031ebc9
parent875bb711902a5a056e924f4c12c91bf8bc3f51b0
merged: r18133,18171 from linuxport branch.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk/XBMC@18467 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
50 files changed:
guilib/GUIButtonControl.cpp
guilib/GUIButtonControl.h
guilib/GUIButtonScroller.cpp
guilib/GUIButtonScroller.h
guilib/GUICheckMarkControl.cpp
guilib/GUICheckMarkControl.h
guilib/GUIControl.cpp
guilib/GUIControl.h
guilib/GUIFadeLabelControl.cpp
guilib/GUIFadeLabelControl.h
guilib/GUILabelControl.cpp
guilib/GUILabelControl.h
guilib/GUIListLabel.cpp
guilib/GUIListLabel.h
guilib/GUIMoverControl.cpp
guilib/GUIMoverControl.h
guilib/GUIMultiSelectText.cpp
guilib/GUIMultiSelectText.h
guilib/GUIProgressControl.cpp
guilib/GUIProgressControl.h
guilib/GUIRSSControl.cpp
guilib/GUIRSSControl.h
guilib/GUIRadioButtonControl.cpp
guilib/GUIRadioButtonControl.h
guilib/GUIResizeControl.cpp
guilib/GUIResizeControl.h
guilib/GUIScrollBarControl.cpp
guilib/GUIScrollBarControl.h
guilib/GUISelectButtonControl.cpp
guilib/GUISelectButtonControl.h
guilib/GUISettingsSliderControl.cpp
guilib/GUISettingsSliderControl.h
guilib/GUISliderControl.cpp
guilib/GUISliderControl.h
guilib/GUISpinControl.cpp
guilib/GUISpinControl.h
guilib/GUISpinControlEx.cpp
guilib/GUISpinControlEx.h
guilib/GUITextBox.cpp
guilib/GUITextBox.h
guilib/GUITexture.cpp
guilib/GUITexture.h
guilib/GUITextureD3D.cpp
guilib/GUIToggleButtonControl.cpp
guilib/GUIToggleButtonControl.h
guilib/TextureManager.cpp
guilib/TextureManager.h
xbmc/GUILargeTextureManager.cpp
xbmc/GUILargeTextureManager.h
xbmc/Picture.cpp