Merge branch 'master' into Mario/use1 298/head
authorMario <mario@smbclan.net>
Fri, 29 Apr 2016 01:13:24 +0000 (11:13 +1000)
committerMario <mario@smbclan.net>
Fri, 29 Apr 2016 01:13:24 +0000 (11:13 +1000)
1  2 
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/t_items.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/util.qh
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/mutators/mutator/gamemode_domination.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge