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)
commit6e0eff1d6102a779c6475e65a96cd5765a930a7e
tree25b4f1ccef61c71e4879d89bb0e202fda686d0b6
parent86c27e0144345611a472f35c1cab3b7e446134d1
parentee4668b0170a195a08abdbbd44b09f23ddd5f3bc
Merge remote branch 'refs/remotes/origin/mirceakitsune/nex_reticle'
defaultXonotic.cfg