]> 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: 18f83d5 d90297f)
Merge branch 'master' into Lyberta/TeamplayFixes_
authorLyberta <lyberta@lyberta.net>
Fri, 17 Mar 2017 20:11:53 +0000 (23:11 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 17 Mar 2017 20:11:53 +0000 (23:11 +0300)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/events.qh patch | diff1 | diff2 | blob | history

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