Merge branch 'master' into mirceakitsune/nex_reticle
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 23 Jun 2010 11:22:00 +0000 (14:22 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 23 Jun 2010 11:22:00 +0000 (14:22 +0300)
commitb08b9feba88065d7f79ebf60d3d5fd5a6928f52e
treea93cfd0a80ef41a198a34de857dd08db313a5409
parent9067a763045e220ff9aa7cff56845983f910efd1
parent3db25ded877aebe6ee5ca1d98f10ce529df4c1f3
Merge branch 'master' into mirceakitsune/nex_reticle
defaultXonotic.cfg