Merge branch 'master' into martin-t/dmgtext2
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 27 May 2017 21:07:32 +0000 (23:07 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 27 May 2017 21:07:32 +0000 (23:07 +0200)
commit63841ddfb9349787f6380b9e9e2606e6d7ed9eb6
tree5b351a85e25ce3d8283aee47efda140dd8e2416e
parent3b3e56d6c0e203d312fd5ee5ec680404c4e9dc2d
parentb08dfbcb2c58fd7b7d4a7b26b7534f36028e300e
Merge branch 'master' into martin-t/dmgtext2
defaultXonotic.cfg