]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Sat, 14 May 2011 18:12:54 +0000 (21:12 +0300)
committerFruitieX <fruitiex@gmail.com>
Sat, 14 May 2011 18:12:54 +0000 (21:12 +0300)
commite6003fb86e11cc3d537395e7205bd9c4cf4d5567
tree8286c3360768648202bba21dae52f4d19845d309
parent650b75b9a9e48d782653ed7f33bab05df8d7e00c
parent75a398ea3ccd09e70c582b508b39aa52415def96
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
defaultXonotic.cfg
qcsrc/client/Main.qc