Merge branch 'master' into fruitiex/newpanelhud
authorRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 11:15:27 +0000 (13:15 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 11:15:27 +0000 (13:15 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/main.qh
qcsrc/common/constants.qh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge