Merge branch 'master' into mirceakitsune/hud_postprocessing
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 21 May 2011 12:15:34 +0000 (15:15 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 21 May 2011 12:15:34 +0000 (15:15 +0300)
commit6e0a2fc04c5f95920d1f64a76f7f96c1e7d1f505
tree3901e1551b3548e97f77797cf2b118829b59ec1a
parentb641258b2cf8cbcd8dc0710e0ad30c84e86a827b
parent2e23497bba19bf2944a5b5306d537e7b7021e688
Merge branch 'master' into mirceakitsune/hud_postprocessing
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh