]> 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: b68184d a3c94f9)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 9 Nov 2017 16:34:13 +0000 (19:34 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 9 Nov 2017 16:34:13 +0000 (19:34 +0300)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

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