Merge branch 'master' into Mario/csqc_models
authorMario <mario.mario@y7mail.com>
Sat, 2 Nov 2013 07:32:28 +0000 (18:32 +1100)
committerMario <mario.mario@y7mail.com>
Sat, 2 Nov 2013 07:32:28 +0000 (18:32 +1100)
commit57f409333cc09406298b66421d5e99357a7f586d
tree4e22e61ff66367ab803d7471b990476792c4d765
parent5ca94d90f868aa0d5bb86cbf284cc9e9bb3e2cf9
parent8a44cef6e025ab6f878cba5c20c35e138f0bdfe4
Merge branch 'master' into Mario/csqc_models
qcsrc/client/hud.qc
qcsrc/client/miscfunctions.qc
qcsrc/server/func_breakable.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/sandbox.qc