]> de.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: e433824 5c9f51c)
Merge branch 'master' into Lyberta/TeamplayFixes2
authorLyberta <lyberta@lyberta.net>
Tue, 28 Nov 2017 09:45:24 +0000 (12:45 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 28 Nov 2017 09:45:24 +0000 (12:45 +0300)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

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