From: Rudolf Polzer Date: Sat, 4 Dec 2010 15:27:20 +0000 (+0100) Subject: Merge remote branch 'origin/mand1nga/waypoints_space-elevator' X-Git-Tag: xonotic-v0.1.0preview~14 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fbde3172160e65e52cb10fdb1b998cac30e16697;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote branch 'origin/mand1nga/waypoints_space-elevator' --- fbde3172160e65e52cb10fdb1b998cac30e16697