From: FruitieX <fruitiex@gmail.com>
Date: Fri, 26 Nov 2010 12:04:07 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into fruitiex/freezetag_mapinfo
X-Git-Tag: xonotic-v0.1.0preview~22^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a34e4566df6923ac2c27abe0cec5f021ec2e6dd1;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/master' into fruitiex/freezetag_mapinfo

Conflicts:
	maps/g-23.mapinfo
---

a34e4566df6923ac2c27abe0cec5f021ec2e6dd1
diff --cc maps/g-23.mapinfo
index 1c994823,594d0365..72ba59af
--- a/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@@ -6,5 -6,4 +6,5 @@@ gametype d
  gametype lms
  gametype arena
  gametype rune
 +gametype freezetag
- cdtrack 6
+ cdtrack 2