Merge branch 'fruitiex/custom_xhair_dot_color' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Mon, 29 Nov 2010 18:46:28 +0000 (20:46 +0200)
committerFruitieX <fruitiex@gmail.com>
Mon, 29 Nov 2010 18:46:28 +0000 (20:46 +0200)
1  2 
defaultXonotic.cfg

Simple merge