]> 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: 953ccd6 1f3154a)
Merge remote-tracking branch 'origin/master' into divVerent/killers-spawn-faster
authorRudolf Polzer <divVerent@gmail.com>
Mon, 23 Oct 2023 22:36:54 +0000 (18:36 -0400)
committerRudolf Polzer <divVerent@gmail.com>
Mon, 23 Oct 2023 22:36:54 +0000 (18:36 -0400)
1  2 
mutators.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/events.qh patch | diff1 | diff2 | blob | history

diff --cc mutators.cfg
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/mutators/events.qh
Simple merge