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)
commit35528e99ccad9a20fbd6eed640a5bc1bda884acd
treec8099c058e89a5893cdaef79db63837b0716674d
parente4fdca5e33811690b935475b5a758872c4eb7659
parent0e81160036a666d61a18f0038613f3ac7cfd9ade
Merge branch 'master' into Mario/use1
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