Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 3 Jan 2012 12:02:44 +0000 (13:02 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 3 Jan 2012 12:02:44 +0000 (13:02 +0100)
commita46374b4d18ea074e2b4cd361fcdb2a0ea08a339
tree674303bfd528605358db99d1ed69c5279326dbdf
parent8b2e16e62d02dfbcf47f08f020a84df547afff68
parent797664da00e9b4fe3d87338802fb661100d54bfc
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
defaultXonotic.cfg