From: Mircea Kitsune Date: Tue, 29 Jun 2010 10:53:07 +0000 (+0300) Subject: Merge branch 'master' into mirceakitsune/nex_reticle X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ee4668b0170a195a08abdbbd44b09f23ddd5f3bc;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mirceakitsune/nex_reticle --- ee4668b0170a195a08abdbbd44b09f23ddd5f3bc