From: Rudolf Polzer Date: Mon, 15 Nov 2010 20:41:26 +0000 (+0100) Subject: Merge remote branch 'origin/fruitiex/branding_lagclock' X-Git-Tag: xonotic-v0.1.0preview~133 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=551f9bb17fc380e5f067f655a973c12249a1fa0b;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/fruitiex/branding_lagclock' --- 551f9bb17fc380e5f067f655a973c12249a1fa0b