]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Tue, 12 Jun 2018 05:24:17 +0000 (15:24 +1000)
committerMario <mario@smbclan.net>
Tue, 12 Jun 2018 05:24:17 +0000 (15:24 +1000)
commit72d25a07e1372793d5c305972eb51892de6aeb75
tree84a9d386efede42e7bb1111805cb7713ba655227
parent5c4e0198b632b298df925652359182f52f3a253f
parent6477b06739f4fa5df9343f635dc3a90b4aa08f67
Merge branch 'master' into Mario/monsters
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc