]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'TimePath/guide_backports' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 24 Aug 2015 03:28:19 +0000 (03:28 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 24 Aug 2015 03:28:19 +0000 (03:28 +0000)
Backport icon handling from TimePath/guide

The guide might be a while, these changes are useful for improving itemstime

See merge request !199


Trivial merge