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)
1  2 
qcsrc/server/mutators/events.qh
qcsrc/server/weapons/selection.qc

Simple merge
Simple merge