]> 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: 9f6f377 f5d5771)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sat, 3 Jun 2017 19:58:05 +0000 (22:58 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 3 Jun 2017 19:58:05 +0000 (22:58 +0300)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

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