Merge remote branch 'origin/master' into samual/fixes_for_latest_merge
authorSamual <samual@xonotic.org>
Wed, 30 Mar 2011 07:34:19 +0000 (03:34 -0400)
committerSamual <samual@xonotic.org>
Wed, 30 Mar 2011 07:34:19 +0000 (03:34 -0400)
commit7ef3afe5cd584fb87dd45a1bc014da913d4f117a
tree7011cf361daacc3bb0866d0223197c687a13e2a0
parent22afadc4dfa7cd52c4e7be045d5e44f06bcf37a2
parentb4586534761d8a86de6ec6f842d67d3717b302e9
Merge remote branch 'origin/master' into samual/fixes_for_latest_merge
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh