Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 16:40:06 +0000 (03:40 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 16:40:06 +0000 (03:40 +1100)
commitdf41a0a1c0d2b58b81c0c4d36791dac2bb365d90
tree7f92e618cfe47aada67b56b30f7e41eae614ce6d
parent9f06d73e2880443d51fc072a837ddb2a5dbb5c1d
parent818fce31675b784a8b1b9b36c0f90fe1d3500eba
Merge branch 'master' into Mario/buff_updates
qcsrc/client/hud.qc