From: Mario <zacjardine@y7mail.com>
Date: Mon, 27 Jul 2015 14:45:58 +0000 (+1000)
Subject: Merge branch 'master' into Mario/ctf_updates
X-Git-Tag: xonotic-v0.8.1~29^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5733b1493c8c3fc14830f78122fe388e89f19338;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/ctf_updates

# Conflicts:
#	qcsrc/common/stats.qh
#	qcsrc/server/mutators/gamemode_ctf.qc
#	qcsrc/server/mutators/gamemode_ctf.qh
---

5733b1493c8c3fc14830f78122fe388e89f19338
diff --cc qcsrc/common/stats.qh
index 547f4b3b6,b488df1cf..9ff1bf4f6
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -107,8 -107,8 +107,9 @@@ const int STAT_HEALING_ORB_ALPHA      
  const int STAT_PLASMA                 = 84;
  const int STAT_OK_AMMO_CHARGE         = 85;
  const int STAT_OK_AMMO_CHARGEPOOL     = 86;
 -const int STAT_FROZEN                 = 87;
 -const int STAT_REVIVE_PROGRESS        = 88;
 +const int STAT_CTF_FLAGSTATUS         = 87;
- // 88 empty?
++const int STAT_FROZEN                 = 88;
++const int STAT_REVIVE_PROGRESS        = 89;
  // 89 empty?
  // 90 empty?
  // 91 empty?