]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 10 May 2017 12:41:05 +0000 (15:41 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 10 May 2017 12:41:05 +0000 (15:41 +0300)
commitcace5deb50859dcb18e15e80b07265988ea40dc3
treec116688ff1f6a39f853cc3778c623196f6c80c3d
parent5827341d35ed375dc911a3b678e1969813fde2c7
parent44182002afcc9fdeca93c8296185258d374f6513
Merge branch 'master' into Lyberta/Survival
qcsrc/server/client.qc
qcsrc/server/g_world.qc