Merge branch 'master' into martin-t/dmgtext2
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 3 Jul 2017 01:49:27 +0000 (03:49 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 3 Jul 2017 01:49:27 +0000 (03:49 +0200)
1  2 
defaultXonotic.cfg

Simple merge