Merge branch 'master' into terencehill/start_ammo
authorterencehill <piuntn@gmail.com>
Sun, 14 Dec 2014 22:42:07 +0000 (23:42 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 14 Dec 2014 22:42:07 +0000 (23:42 +0100)
commit90c787a8242a7876e34940fe6d76d1395ea54389
tree2fe7de38bdc7b96c3a9e138d5862c198d5614d7e
parentcddfb671b3d067a791c3a46b96900cb0c8b2a29b
parente6eb6e7fc36a3a243c5171b8cc3db88e823514d4
Merge branch 'master' into terencehill/start_ammo
qcsrc/server/miscfunctions.qc