From: Rudolf Polzer Date: Fri, 19 Nov 2010 12:49:26 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.1.0preview~46 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=792b0f964cf79db3be162a6b86c77e28a1096aeb;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- 792b0f964cf79db3be162a6b86c77e28a1096aeb