]> 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: 85ee732 88143d3)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Wed, 24 May 2017 04:33:43 +0000 (07:33 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 24 May 2017 04:33:43 +0000 (07:33 +0300)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history

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