]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Tue, 10 Jan 2012 19:13:15 +0000 (14:13 -0500)
committerSamual <samual@xonotic.org>
Tue, 10 Jan 2012 19:13:15 +0000 (14:13 -0500)
commit7b71d7d90d28e0365ce11f94c3460f5b71211312
treecafb632c0fa9126f39bd8e6d551a2e65b51b5420
parent26ec33d6d19e627b43ac2cb51f83f890b5176293
parentfc3d7d66997fda962152de345a861cc454b57f37
Merge remote branch 'origin/master' into samual/menu_updates

Conflicts:
defaultXonotic.cfg
defaultXonotic.cfg