From: Rudolf Polzer Date: Wed, 22 Dec 2010 19:48:13 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.1.0preview X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a8fb7be8017d2bd0efa4fcf85eb72221f93314bc;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 6ae67162d032e07c05b798721d417711f2d067c7