From: Rudolf Polzer Date: Thu, 23 Sep 2010 14:42:36 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~202 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=65a79fa2676d189418cecfb0ef68676ccb170a6c;p=xonotic%2Fxonotic.git Merge branch 'master' of ssh://git.xonotic.org/xonotic --- 65a79fa2676d189418cecfb0ef68676ccb170a6c