Merge branch 'master' into sdl2.0

This commit is contained in:
Pere Pujal i Carabantes 2021-01-16 00:53:38 +01:00
commit afa562680e
160 changed files with 12539 additions and 9026 deletions

View file

@ -3,7 +3,7 @@
Options Documentation
Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt
Copyright (c) 2002-2021 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
December 27, 2020
@ -607,9 +607,14 @@ Windows Users
Note: When the defaults are used, a new "TuxPaint" subdirectory
will be created and used. (e.g., "~/Pictures/TuxPaint") When the
"--exportdir" option is used, the exact path specified will be
used (no "TuxPaint" subdirectory is created). It is expected
that the parent directory exists. (The directory itself will be
created, if it doesn't.)
used (no "TuxPaint" subdirectory is created).
The directory itself (e.g., "~/Pictures/TuxPaint") will be
created, if it doesn't exist.
If the parent directory (e.g., "~/Pictures") also does not
exist, Tux Paint will attempt to create it as well (but not any
directories higher than that).
Example: exportdir=/home/penguin/TuxPaintExports

View file

@ -3,10 +3,10 @@
A simple drawing program for children
Copyright 2002-2020 by various contributors; see AUTHORS.txt
Copyright 2002-2021 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
June 14, 2002 - December 27, 2020
June 14, 2002 - January 13, 2021
----------------------------------------------------------------------

View file

@ -25,7 +25,7 @@
</h2>
<p>
Copyright (c) 2002-2020 by various contributors; see
Copyright (c) 2002-2021 by various contributors; see
AUTHORS.txt<br>
<a href=
"http://www.tuxpaint.org/">http://www.tuxpaint.org/</a>
@ -1274,9 +1274,16 @@
and used. (e.g., "<code>~/Pictures/TuxPaint</code>")
When the "<code>--exportdir</code>" option is used, the
exact path specified will be used (no
"<code>TuxPaint</code>" subdirectory is created). It is
expected that the parent directory exists. (The
directory itself will be created, if it doesn't.)
"<code>TuxPaint</code>" subdirectory is created).
</p>
<p>
The directory itself (e.g., "<code>~/Pictures/TuxPaint</code>")
will be created, if it doesn't exist.
</p>
<p>
If the <em>parent</em> directory (e.g., "<code>~/Pictures</code>")
also does not exist, Tux&nbsp;Paint will attempt to create it
as well (but not any directories higher than that).
</p>
<p>

View file

@ -28,14 +28,14 @@
</h3>
<p>
Copyright 2002-2020 by various contributors; see
Copyright 2002-2021 by various contributors; see
AUTHORS.txt<br>
<a href=
"http://www.tuxpaint.org/">http://www.tuxpaint.org/</a>
</p>
<p>
June 14, 2002 - December 27, 2020
June 14, 2002 - January 13, 2021
</p>
</center>