]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into fruitiex/multijump
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 14 Aug 2010 16:24:59 +0000 (19:24 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 14 Aug 2010 16:24:59 +0000 (19:24 +0300)
commitfebfec579435117da1469a14456badb58ce2e177
tree1ca47900b7ea061511d6a5874cc1702fa2fa8cca
parent9d52c7b5787272829bdda1bfcf0955d9f4aa427c
parentba2dad4f0c8275b5fc3545328195c7e763acab8a
Merge remote branch 'origin/master' into fruitiex/multijump
defaultXonotic.cfg