]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into terencehill/menu_tooltips_2
authorSamual <samual@xonotic.org>
Tue, 27 Sep 2011 03:19:46 +0000 (23:19 -0400)
committerSamual <samual@xonotic.org>
Tue, 27 Sep 2011 03:19:46 +0000 (23:19 -0400)
commit72d3dea2617743a60d67fe3b87e4a71a3557bc3a
tree3c267fe1a5d6bba1004aff21b765e9f716545c08
parent2485e2cf336792c8a1a423d9b224c340dac2282e
parenta084941bf63f7b642b99eb5845e3020792a58501
Merge remote branch 'origin/master' into terencehill/menu_tooltips_2
defaultXonotic.cfg