]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitb219046c9f21b19ffae8a1bfe7f2a97ff30f7930
tree0157e97b12281ad1d7463bff92fb0a5d2056455b
parentf27a9c3e1be558b4b6211e6565e8b68f7a1ffd1c
parent51c7e0a875a0a15201f57787071a21d327d1bb26
Merge branch 'TimePath/guide_backports' into 'master'

Backport icon handling from TimePath/guide

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

See merge request !199