From: Mario <zacjardine@y7mail.com>
Date: Sat, 6 Dec 2014 02:50:10 +0000 (+1100)
Subject: Merge branch 'master' into Mario/ctf_updates
X-Git-Tag: xonotic-v0.8.1~29^2~20
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=71b5d156665cb765874fc36c3fd3daa62ff81d63

Merge branch 'master' into Mario/ctf_updates

Conflicts:
	qcsrc/server/mutators/gamemode_ctf.qc
---

71b5d156665cb765874fc36c3fd3daa62ff81d63
diff --cc qcsrc/server/mutators/gamemode_ctf.qc
index 8243bcc6ec,4e051d1972..a90a626b6e
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@@ -1053,8 -930,7 +1053,9 @@@ void ctf_RespawnFlag(entity flag
  	flag.ctf_dropper = world;
  	flag.ctf_pickuptime = 0;
  	flag.ctf_droptime = 0;
+ 
 +	flag.ctf_flagdamaged = 0;
- 	
++
  	ctf_CheckStalemate();
  }