From: Rudolf Polzer Date: Wed, 23 Jun 2010 08:36:15 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots' X-Git-Tag: xonotic-v0.1.0preview~532 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=16c35f41a25bb2edf3d4b7d664049d2923000f96;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots' --- 16c35f41a25bb2edf3d4b7d664049d2923000f96