Merge branch 'master' into sdl2.0

Merging master 2019-september-24 into sdl2.0 branch
This commit is contained in:
Pere Pujal i Carabantes 2019-09-24 14:52:40 +02:00
commit a1c778135d
52 changed files with 921 additions and 803 deletions

View file

@ -16,10 +16,10 @@ version
</h1>
<h2>Options Documentation</h2>
<p>Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt<br/>
<p>Copyright (c) 2002-2019 by various contributors; see AUTHORS.txt<br/>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>December 18, 2018</p>
<p>September 21, 2019</p>
</center>
@ -192,6 +192,12 @@ version
cannot be used to reenable sounds if they were disabled using this option.)
</dd>
<dt><code><b>nostereo=yes</b></code></dt>
<dd>
Disable stereo panning support. (Useful for users with hearing impairment
in one ear, or places where a single speaker or headphone is being used.)
</dd>
<dt><code><b>noquit=yes</b></code></dt>
<dd>
<p>Disable the on-screen "Quit" button and prevent the <b>[Escape]</b> key
@ -1530,6 +1536,7 @@ version
--allowscreensaver<br>
--startblank<br>
--nosound<br>
--nostereo<br>
--noquit<br>
--noprint<br>
--printdelay=<i>SECONDS</i><br>
@ -1606,6 +1613,7 @@ version
--disablescreensaver<br>
--startlast<br>
--sound<br>
--stereo<br>
--quit<br>
--print<br>
--printdelay=0<br>