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)
1  2 
defaultXonotic.cfg

Simple merge