]> 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: 59a213a 701b723)
Merge branch 'master' into Mario/monsters
authorMario <zacjardine@y7mail.com>
Sun, 9 Sep 2018 12:44:26 +0000 (22:44 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 9 Sep 2018 12:44:26 +0000 (22:44 +1000)
1  2 
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history
qcsrc/common/turrets/sv_turrets.qc patch | diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/notifications/all.inc
Simple merge
diff --cc qcsrc/common/turrets/sv_turrets.qc
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge