Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Fri, 12 Nov 2010 22:19:23 +0000 (23:19 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 12 Nov 2010 22:19:23 +0000 (23:19 +0100)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/hud.qc

Simple merge
Simple merge
Simple merge