Merge branch 'master' into msvc-warn-audit
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Mon, 16 Sep 2019 14:55:42 +0000 (16:55 +0200)
committerGitHub <noreply@github.com>
Mon, 16 Sep 2019 14:55:42 +0000 (16:55 +0200)
commitb40e3e7b4e021bfef5a3762f98378295e77d0bdd
tree52ec05563edd60a20a4f1b65510c2c13c13f8823
parente89ff9ae61bfec98db8348628dac2bc0fd4cd8ef
parent44d954ade9aa3067d7de11787ded5b2d81057477
Merge branch 'master' into msvc-warn-audit
src/gui/wizard/slideshow.cpp
src/gui/wizard/webview.cpp