]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:10:39 +0000 (16:10 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:10:39 +0000 (16:10 +0300)
commit377118d83d5aa163a067854eadb767769a709781
tree1cc7522273e70ccd4e8189e92eb824a2dde7e075
parentfb7d5d10cac16dc6e01a9c2e0fcc1a53449bb748
parent88e05e4b19e3d43d41fa740076a4f02ed781dee6
Merge branch 'Lyberta/Survival' into Lyberta/master
defaultXonotic.cfg
qcsrc/server/client.qc