From: Rudolf Polzer Date: Sat, 23 Oct 2010 15:35:45 +0000 (+0200) Subject: Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.1.0preview~114 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=203dabbcb3354574527995954ce1f1e27b02825f Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic --- 203dabbcb3354574527995954ce1f1e27b02825f