From: unknown <jm@.(none)>
Date: Thu, 11 Nov 2010 00:09:03 +0000 (+0100)
Subject: Fix conflict
X-Git-Tag: xonotic-v0.1.0preview~153^2~2^2~3
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=e3449b33968c2562dcb06287b4a06562de8dcb67;hp=e3449b33968c2562dcb06287b4a06562de8dcb67;p=xonotic%2Fxonotic-data.pk3dir.git

Fix conflict
---