]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Mon, 17 May 2010 17:17:45 +0000 (20:17 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Mon, 17 May 2010 17:17:45 +0000 (20:17 +0300)
commit2ef908ed0fef3660c024e7943863a98dc94fe398
tree3fd095c1eb7adfa559e2b443f7b29a86f2cf56aa
parent6eaec7fb6f17209698fdb722d2f7959628613e1a
parent341a9fb28cec1a27add0d8456e884e6ed4c6b97f
Merge branch 'master' into fruitiex/newpanelhud
defaultXonotic.cfg
qcsrc/client/Main.qc