]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 1 Jan 2012 20:19:01 +0000 (15:19 -0500)
committerSamual <samual@xonotic.org>
Sun, 1 Jan 2012 20:19:01 +0000 (15:19 -0500)
commit4f926be80533640c5531417f7553de6c3da0c528
treee68908033c89abc730e76e74519788781010de45
parent03909954b4ee287a38a122291fb8a6166b834a72
parentbd05d36d3ff5205d1c33689d73119a3010ac3f31
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg