]> 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: 7d61ba9 1235b82)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sun, 18 Mar 2018 05:15:28 +0000 (08:15 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 18 Mar 2018 05:15:28 +0000 (08:15 +0300)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
xonotic-server.cfg patch | diff1 | diff2 | blob | history

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