Merge branch 'master' into sdl2.0

This commit is contained in:
Pere Pujal i Carabantes 2018-08-30 01:37:00 +02:00
commit 1a5308226c
37 changed files with 1696 additions and 771 deletions

View file

@ -17,13 +17,10 @@ version
<br>
Extending Tux Paint</h1>
<p>Copyright 2002-2016 by Bill Kendrick and others<br>
New Breed Software</p>
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
<p>Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt<br/>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>June 14, 2002 - December 11, 2016</p>
<p>June 14, 2002 - August 28, 2018</p>
</center>
<hr size=2 noshade>
@ -495,7 +492,7 @@ effect.</p>
<h6>Tinting Options:</h6>
<blockquote>
<p>Depending on the contents of your stamp, you might want to
have Tux&nbsp;Paint use one of a numer of methods when tinting it.
have Tux&nbsp;Paint use one of a number of methods when tinting it.
Add one of the following lines to the stamp's data file:</p>
<dl>

View file

@ -16,13 +16,10 @@ version
<br>
Frequently Asked Questions</h1>
<p>Copyright 2002-2017 by Bill Kendrick and others<br>
New Breed Software</p>
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
<p>Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt<br/>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>September 14, 2002 - December, 2017</p>
<p>September 14, 2002 - August 28, 2018</p>
</center>
<h2>Drawing-related</h2>

View file

@ -16,13 +16,10 @@ version
</h1>
<h2>Options Documentation</h2>
<p>Copyright 2002-2016 by Bill Kendrick and others<br>
New Breed Software</p>
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
<p>Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt<br/>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>December 11, 2016</p>
<p>August 28, 2018</p>
</center>

View file

@ -17,16 +17,12 @@ version
</h1>
<h3>A simple drawing program for children</h3>
<p>Copyright 2002-2017 by Bill Kendrick and others<br>
<a href="http://www.newbreedsoftware.com/">New Breed Software &amp;
<a href="http://tux4kids.alioth.debian.org/">Tux4Kids</a></p>
<p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
<p>Copyright 2002-2018 by various contributors; see AUTHORS.txt<br>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>June 14, 2002 -
December 3, 2017</p>
August 28, 2018</p>
</center>