]> 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: 2f0f4af 7008617)
Merge branch 'master' into DefaultUser/kick_teamkiller
authorMario <mario@smbclan.net>
Sat, 25 Nov 2017 06:37:25 +0000 (16:37 +1000)
committerMario <mario@smbclan.net>
Sat, 25 Nov 2017 06:37:25 +0000 (16:37 +1000)
# Conflicts:
# mutators.cfg

1  2 
mutators.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/_mod.inc patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/_mod.qh patch | diff1 | diff2 | blob | history
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history

diff --cc mutators.cfg
Simple merge
diff --cc qcsrc/common/mutators/mutator/_mod.qh
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge