]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/menu_updates
authorRudolf Polzer <divverent@alientrap.org>
Wed, 25 Jan 2012 18:20:42 +0000 (19:20 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 25 Jan 2012 18:20:42 +0000 (19:20 +0100)
commita3e9e9f6fb5cfc04c8f19039097ded8ad6cd8c91
tree1cefc9977701054f6a703d9b7d7513c5fb8031d7
parent0976541b090667e88d57d867a9a0071f5a15373f
parent9e1b0c3448949656a49999e9c918bfe2736c571e
Merge remote-tracking branch 'origin/master' into samual/menu_updates
defaultXonotic.cfg