From: Samual <samual@xonotic.org>
Date: Mon, 28 Mar 2011 18:23:01 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/mutator_ctf
X-Git-Tag: xonotic-v0.7.0~240^2~186
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=85fcc50125959d738f1295bfc1645cad4c8b26fc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/mutator_ctf
---

85fcc50125959d738f1295bfc1645cad4c8b26fc
diff --cc qcsrc/server/progs.src
index 71f51b694,cf5c7d6a8..a86de4935
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -180,8 -180,9 +181,10 @@@ anticheat.q
  cheats.qc
  playerstats.qc
  
+ ../common/explosion_equation.qc
+ 
  mutators/base.qc
 +mutators/gamemode_ctf.qc
  mutators/gamemode_keyhunt.qc
  mutators/gamemode_freezetag.qc
  mutators/gamemode_keepaway.qc