Merge branch 'master' into mirceakitsune/nex_reticle
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 29 Jun 2010 10:53:07 +0000 (13:53 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 29 Jun 2010 10:53:07 +0000 (13:53 +0300)
commitee4668b0170a195a08abdbbd44b09f23ddd5f3bc
tree8078cc3b1b9bc888919c9de80cdaec4667396b41
parenta503baa89d83820d87badd9a12a2de6c2dac8b43
parentf291cdc835b56a498dd981b2e7e2bcfbfcf04ee3
Merge branch 'master' into mirceakitsune/nex_reticle
defaultXonotic.cfg