]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d99942 3bd8ea1)
Merge remote-tracking branch 'origin/samual/makemulti_inverse'
authorSamual Lenks <samual@xonotic.org>
Mon, 30 Dec 2013 18:51:18 +0000 (13:51 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 30 Dec 2013 18:51:18 +0000 (13:51 -0500)
* origin/samual/makemulti_inverse:
  Remove r_hidewater changes from this branch
  Add ability for makeMulti inverse cvars (for r_water_hideplayer switching)


Trivial merge