From: Rudolf Polzer Date: Tue, 2 Nov 2010 16:45:08 +0000 (+0100) Subject: Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.1.0preview~96 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=238ea4253cb24b010aca1aee63fb33eed44c2efd Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic --- 238ea4253cb24b010aca1aee63fb33eed44c2efd