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)
commit387c8741f204da7abe419adbdbccccaa8110d20d
treecc06ffc191806eebf56dbf2c7363da5126e8f77c
parentdd83731504cf2bffdb10c8301783d48a03365951
parenteada828eb213aaa62f48c87926f3cf88648fd22e
Merge branch 'master' into martin-t/dmgtext2
defaultXonotic.cfg