]> 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: 1c1f0da eb0f354)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sun, 11 Mar 2018 04:34:43 +0000 (07:34 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 11 Mar 2018 04:34:43 +0000 (07:34 +0300)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

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