Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sun, 10 Oct 2010 19:57:37 +0000 (21:57 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 10 Oct 2010 19:57:37 +0000 (21:57 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc

Simple merge
Simple merge