From: TimePath Date: Mon, 24 Aug 2015 03:28:19 +0000 (+0000) Subject: Merge branch 'TimePath/guide_backports' into 'master' X-Git-Tag: xonotic-v0.8.2~2043 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b219046c9f21b19ffae8a1bfe7f2a97ff30f7930;p=xonotic%2Fxonotic-data.pk3dir.git 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 --- b219046c9f21b19ffae8a1bfe7f2a97ff30f7930