Merge branch 'master' into samual/keepaway
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 14:43:29 +0000 (16:43 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 14:43:29 +0000 (16:43 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc

Simple merge
Simple merge