Merge remote branch 'refs/remotes/origin/mirceakitsune/nex_reticle'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 2 Jul 2010 08:19:20 +0000 (10:19 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 2 Jul 2010 08:19:20 +0000 (10:19 +0200)
1  2 
defaultXonotic.cfg

Simple merge