]> 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: 701e61a 8224061)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sat, 26 Aug 2017 23:18:06 +0000 (02:18 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 26 Aug 2017 23:18:06 +0000 (02:18 +0300)
1  2 
defaultClient.cfg patch | diff1 | diff2 | blob | history
gamemodes-server.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

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