Merge branch 'master' into mirceakitsune/hud_postprocessing
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 23 Jun 2011 11:59:26 +0000 (14:59 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 23 Jun 2011 11:59:26 +0000 (14:59 +0300)
commit36f4b513fd7eac9b2dc37d393cebf3b7d98ac9af
tree5edaf4eacbf50405eb7fbb365ee78df31ff7e453
parent60f1e3301beae3dac0765d8ee8eb350ee21c8f30
parent2e44f19e0c92cf7fab9e7d21f15abda16118765b
Merge branch 'master' into mirceakitsune/hud_postprocessing
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh