Merge branch 'master' into mirceakitsune/nex_reticle
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 24 Jun 2010 12:00:24 +0000 (15:00 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 24 Jun 2010 12:00:24 +0000 (15:00 +0300)
commit1df5d11d4b4ac8cb8f27a054802c8db1a04e8850
tree0d9e461cd313c3a61210281a6ebcb275e944ec50
parentb08b9feba88065d7f79ebf60d3d5fd5a6928f52e
parent72e0265e1d98266c5fc6b69ed2c9190bf5f10d88
Merge branch 'master' into mirceakitsune/nex_reticle
defaultXonotic.cfg