aboutsummaryrefslogtreecommitdiff
path: root/guilib/GUILabelControl.h
AgeCommit message (Collapse)Author
2011-01-24Merged cptspiff's code-reshuffle branch.theuni
Squashed commit due to build breakage during code-reshuffle history. Conflicts: xbmc/Util.cpp xbmc/cdrip/CDDARipper.cpp xbmc/filesystem/Directory.cpp xbmc/filesystem/File.cpp
2011-01-23Revert "Merge remote branch 'upstream/master'"Lars Op den Kamp
This reverts commit 4e98a514c6a2975ec234fe19fe058e7e74bcfb7d, reversing changes made to 8d73cbde1dcd240d80bee9301d0321703a15c995.
2011-01-04merge pvr-testing2 svn rev 32591 into trunkLars Op den Kamp
2010-05-06added: Ticket #8885 - <scrollspeed> and <scrollsuffix> more generally. ↵jmarshallnz
Thanks to EqUiNoX git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29851 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
2010-02-12refactor: factored out some more label code and cleaned up a bunch of mess. ↵jmarshallnz
Skinners please check your skins for any oddness. git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27702 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
2010-01-13added: auto sizing for the width of a label control. Ticket #6510. Specify ↵jmarshallnz
<width min="50" max="100">auto</width>. git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@26770 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
2009-09-24cleanup: GUIInfoColor.cpp/h -> GUIInfoTypes.cpp/h, and moved GUIInfoLabel in ↵jmarshallnz
there. Will need OSX project loving. git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23126 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
2009-09-23step 3/4: Move linuxport to trunk. How'd I get roped into this?AlTheKiller
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23097 568bbfeb-2a22-0410-94d2-cc84cf5bfa90