]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e22b4ae 4b71223)
Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Fri, 3 Apr 2015 07:48:19 +0000 (18:48 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 3 Apr 2015 07:48:19 +0000 (18:48 +1100)
1  2 
mutators.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

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