]> 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: 5ef5a76 c90f124)
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 15:03:37 +0000 (18:03 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 15:03:37 +0000 (18:03 +0300)
1  2 
qcsrc/server/mutators/events.qh patch | diff1 | diff2 | blob | history

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