Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Fri, 16 Dec 2016 03:43:58 +0000 (13:43 +1000)
committerMario <mario@smbclan.net>
Fri, 16 Dec 2016 03:43:58 +0000 (13:43 +1000)
commitf6a5832d12fbcf7fb4f44778063e2c251b9d0a38
treeaedd596798fb7164a50768a228b45998bbdd72a2
parent0f6c4bee8db75b0aded48382af1c2693b19624de
parente780574e67372200cb642b8f38c706a3d8007e38
Merge branch 'master' into Mario/wepent_experimental
qcsrc/server/mutators/events.qh
qcsrc/server/weapons/selection.qc