aboutsummaryrefslogtreecommitdiff
path: root/guilib/MatrixGLES.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
2010-05-18[arm] merge arm-camelot into trunk, thanks to mcgeagh for all his hard ↵davilla
working getting arm platform rolling git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30281 568bbfeb-2a22-0410-94d2-cc84cf5bfa90