]> 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: 23ad6cc b7d32c1)
Merge remote-tracking branch 'origin/Mario/spawnsystem_mutator'
authorSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 20:33:35 +0000 (15:33 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 20:33:35 +0000 (15:33 -0500)
# By Mario
# Via Mario
* origin/Mario/spawnsystem_mutator:
  Fix compile error
  Merge spawnsystem into the existing mutator
  Move overkill's spawn system into a separate mutator

1  2 
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/autocvars.qh
Simple merge