]> 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: 524d2e5 cc78077)
Merge branch 'master' into Lyberta/mutator_is_enabled
authorLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)
1  2 
qcsrc/common/mutators/mutator/nix/sv_nix.qc patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/pinata/sv_pinata.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/g_damage.qc
Simple merge