]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 21 Sep 2017 23:05:28 +0000 (02:05 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 21 Sep 2017 23:05:28 +0000 (02:05 +0300)
commit1dbc36b11d68a693c711d9a743623625ce7db3a9
tree023dc5a9aae7f439aa38373880cd33f5d0075dda
parent3cf830ba90a3943592f04a0cabbe21088eb86377
parent9d323ee2bb47d17ece4b133cc498be455772e680
Merge branch 'master' into Lyberta/master
defaultServer.cfg
qcsrc/server/client.qc