Merge branch 'master' into Mario/weapons_new
authorMario <zacjardine@y7mail.com>
Tue, 9 Dec 2014 01:52:23 +0000 (12:52 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 9 Dec 2014 01:52:23 +0000 (12:52 +1100)
commit945e6b7cee9fa95c13a80805b2f5d60256216793
tree64139cf74b3432d5a38461da4957365ea324c436
parent81eeee74b314802d8decf44de6d01395e240f38d
parentb4613e5904114aaa84c02bf0811b8581e7e5f4c6
Merge branch 'master' into Mario/weapons_new
qcsrc/client/csqcmodel_hooks.qc