]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/turrets/turret/hellion_weapon.qc
Merge branch 'master' into Mario/weaponentities
authorMario <mario@smbclan.net>
Mon, 8 Aug 2016 13:49:54 +0000 (23:49 +1000)
committerMario <mario@smbclan.net>
Mon, 8 Aug 2016 13:49:54 +0000 (23:49 +1000)
commit0bc82ed18958bfca28a49a2793e3318d78050d15
tree405e9e70537eb257588e8440a64990b3b1b4b31d
parentd628dcb7e0be8124fe4873240abda71c81999cfd
parentb6d22ea672a1e0b7924a8ac804933a90ea7baabd
Merge branch 'master' into Mario/weaponentities
qcsrc/server/weapons/throwing.qc