]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e500c4c a11e321)
Merge branch 'Mario/is_macro' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 06:16:08 +0000 (06:16 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 06:16:08 +0000 (06:16 +0000)
Merge branch Mario/is_macro (M merge request)

Adds IS_MONSTER, IS_TURRET & IS_VEHICLE macros.

See merge request !188


Trivial merge