]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Fri, 28 Apr 2017 18:48:31 +0000 (21:48 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 28 Apr 2017 18:48:31 +0000 (21:48 +0300)
commit5307d7fefbef76a87924884deadb8eb9e7e95470
treec345ee830299758d98e9b50308c0a26b1dcedcdc
parenta344de638829ed57716c1416176f01f20c930a20
parent0d3433983a92ad80893fd18781e01a99857e94c1
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
qcsrc/server/client.qc
qcsrc/server/g_world.qc