Merge remote branch 'origin/fruitiex/panelhud'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:40:21 +0000 (21:40 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:40:21 +0000 (21:40 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/w_minstanex.qc

Simple merge
Simple merge