From: Samual Lenks <samual@xonotic.org>
Date: Mon, 30 Dec 2013 18:51:18 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/samual/makemulti_inverse'
X-Git-Tag: xonotic-v0.8.0~246
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=490873e0e642771efcb3f48ea43236ac0370cacd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/makemulti_inverse'

* origin/samual/makemulti_inverse:
  Remove r_hidewater changes from this branch
  Add ability for makeMulti inverse cvars (for r_water_hideplayer switching)
---

490873e0e642771efcb3f48ea43236ac0370cacd