Merge branch 'master' into mirceakitsune/hud_postprocessing
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 13 May 2011 20:11:06 +0000 (23:11 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 13 May 2011 20:11:06 +0000 (23:11 +0300)
commitc0749beee99dad58e1d00ae03026a6564dea0d39
tree866c09827e999a7e0825311bfb1c0b5b40bbe0ce
parent96b641bfa4afe360fdecf39521aac7f6b5ed07b9
parentbdfd71723a38e659cf26a894e07d8f77a5a1e79f
Merge branch 'master' into mirceakitsune/hud_postprocessing
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh