]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/weapons_fpsfix
authorMario <mario@smbclan.net>
Tue, 10 Apr 2018 07:44:20 +0000 (17:44 +1000)
committerMario <mario@smbclan.net>
Tue, 10 Apr 2018 07:44:20 +0000 (17:44 +1000)
commit2f5be9d57047af3227805ef251ab8c6cf09baf2b
tree123e60f82fd25f9083af69b8c7103a9963abf753
parent73cf8f100c70465aa8a10680a2ca22841f5dcfdc
parentb280cfa395acceb4cb3baceda44999a90f406899
Merge branch 'master' into Mario/weapons_fpsfix
qcsrc/common/models/model.qh
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/server/weapons/weaponsystem.qc