From: Mario <zacjardine@y7mail.com>
Date: Fri, 21 Aug 2015 06:16:08 +0000 (+0000)
Subject: Merge branch 'Mario/is_macro' into 'master'
X-Git-Tag: xonotic-v0.8.2~2064
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=91b39b7f670f5a1234c18ec92851eb1a1f176d8c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/is_macro' into 'master'

Merge branch Mario/is_macro (M merge request)

Adds IS_MONSTER, IS_TURRET & IS_VEHICLE macros.

See merge request !188
---

91b39b7f670f5a1234c18ec92851eb1a1f176d8c