From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 22 Oct 2010 14:10:00 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/glowplantdompoints'
X-Git-Tag: xonotic-v0.1.0preview~79
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2384025a48c543d07b9686cba856cb2692a4605b;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/fruitiex/glowplantdompoints'
---

2384025a48c543d07b9686cba856cb2692a4605b
diff --cc maps/glowplant.mapinfo
index c5bfde86,b96f88b3..7545fa6d
--- a/maps/glowplant.mapinfo
+++ b/maps/glowplant.mapinfo
@@@ -5,9 -5,9 +5,10 @@@ cdtrack 
  has weapons
  type dm 30 20 0
  type tdm 50 20 2 0
+ type dom 200 20 0
  type rune 200 20 0
  type lms 9 20 0
 +type arena 10 20 0
  type ca 10 20 0
  type kh 1000 20 3 0
  // optional: fog density red green blue alpha mindist maxdist