]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'terencehill/crosshair_colors' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Fri, 12 Nov 2010 06:49:55 +0000 (08:49 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 12 Nov 2010 06:49:55 +0000 (08:49 +0200)
commitcb0dd369118ab822156128516ebcdd8350c70e9b
tree78ac0bb402f5f811befc805afff1eaa38f64d56d
parent588f54022c00be6cedc1936cf61181da57ec8b38
parentc1310c0cc29e7d162a3a27b61572c24ec370841c
Merge branch 'terencehill/crosshair_colors' into fruitiex/panelhud
defaultXonotic.cfg
qcsrc/client/View.qc