From: Rudolf Polzer Date: Tue, 29 Jan 2013 19:33:06 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/morphed/pillar', closes #1256 X-Git-Tag: xonotic-v0.7.0~54 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=d38c1f7121d3bd768216a8fe9e163a54e9cb3b9b Merge remote-tracking branch 'origin/morphed/pillar', closes #1256 --- d38c1f7121d3bd768216a8fe9e163a54e9cb3b9b