Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Wed, 15 Sep 2010 11:03:34 +0000 (13:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 15 Sep 2010 11:03:34 +0000 (13:03 +0200)
commit0779e42746dd9576b4386f36788a2bc47ef56aa0
tree055bd8198ce41e9b1cd30081ee7c87269c5704d5
parent9ddc4a6d3d9e74c899fb9f850dc337343cbd5aab
parentd78c36028a8c9b723389e0333657bc92ec2a62bd
Merge branch 'master' into divVerent/crypto2
defaultXonotic.cfg