From: Rudolf Polzer Date: Wed, 15 Dec 2010 11:38:08 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.1.0preview~16 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=97fe16d7d3bf7c97873cc5ef52730fee817a6f72 Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- 97fe16d7d3bf7c97873cc5ef52730fee817a6f72