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)
commit1cc8c2df67b9f8fa750fb410ec51ffaa4d49482a
treeee776b7cf7ecb9c0cc6e3cb59484ec7f75a86794
parent1a63eed36e483946ef9644a42882123f4ba29853
parent37160302199694c0be69f15cb454af93e2edb4bf
Merge branch 'fruitiex/custom_xhair_dot_color' into fruitiex/panelhud
defaultXonotic.cfg