From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 22 Oct 2010 21:04:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.1.0preview~257
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=32a236520a84b7ba28cfa27e9b05a43875bcbfd6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

Conflicts:
	balanceXonotic.cfg
---

32a236520a84b7ba28cfa27e9b05a43875bcbfd6