From: Rudolf Polzer Date: Fri, 16 Apr 2010 17:00:22 +0000 (+0200) Subject: Merge commit 'origin/parasti/uncrlf' into divVerent/bastet X-Git-Tag: xonotic-v0.1.0preview~612^2~20^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0edf1092fa38a3a8d8a882f7d6388473ae3e2a66;p=xonotic%2Fxonotic-data.pk3dir.git Merge commit 'origin/parasti/uncrlf' into divVerent/bastet --- 0edf1092fa38a3a8d8a882f7d6388473ae3e2a66