From: Rudolf Polzer Date: Sat, 13 Jul 2013 09:18:25 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/matthiaskrgr/glassx' X-Git-Tag: xonotic-v0.8.0~34 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e96423ad45ba9dea75b5a4ffdfbb681b4bee9d1;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote-tracking branch 'origin/matthiaskrgr/glassx' --- 3e96423ad45ba9dea75b5a4ffdfbb681b4bee9d1