Merge branch 'master' into mirceakitsune/nex_reticle
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Jun 2010 22:59:33 +0000 (01:59 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Jun 2010 22:59:33 +0000 (01:59 +0300)
commit85ff31f9ec26adf70f835d95184f6dded9d0c785
tree38ecfa2cb5769e578c56e2ec6beb0b80fb6e8219
parent156a91fc7113a35a406b6567937f54d378a2a430
parent935284ad5c227eebb998de74980fb3ebdd5cb7b7
Merge branch 'master' into mirceakitsune/nex_reticle
defaultXonotic.cfg
qcsrc/client/View.qc