]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Fri, 28 Apr 2017 18:47:18 +0000 (21:47 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 28 Apr 2017 18:47:18 +0000 (21:47 +0300)
commit739988d515334e20a1cce2e8a90cb68be11cb111
treecbe2945f690d9e1ba8a88ccc8cb7854a9bae0e0c
parente36d37e55a0ca14723982d22c8d48356d4e8ac64
parent45e13bf47c14855400cbaa613e087c260dc49343
Merge branch 'master' into Lyberta/Survival
qcsrc/server/client.qc
qcsrc/server/g_world.qc