Merge remote-tracking branch 'origin/master' into eqstream

This commit is contained in:
KimLS
2017-02-25 15:31:40 -08:00
25 changed files with 11829 additions and 3046 deletions
+1 -1
View File
@@ -8902,7 +8902,7 @@ void Client::ProcessAggroMeter()
if (m_aggrometer.set_pct(AggroMeter::AT_Group3, 0))
add_entry(AggroMeter::AT_Group3);
if (m_aggrometer.set_pct(AggroMeter::AT_Group4, 0))
add_entry(AggroMeter::AT_Group5);
add_entry(AggroMeter::AT_Group4);
if (m_aggrometer.set_pct(AggroMeter::AT_Group5, 0))
add_entry(AggroMeter::AT_Group5);
}