]> 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: e60056d f1296f5)
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Mon, 5 Feb 2018 17:08:43 +0000 (20:08 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 5 Feb 2018 17:08:43 +0000 (20:08 +0300)
1  2 
defaultServer.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

diff --cc defaultServer.cfg
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge