Merge branch 'master' into sdl2.0
This commit is contained in:
Pere Pujal i Carabantes 2020-12-28 21:55:49 +01:00
commit dc332fc161
16 changed files with 2609 additions and 2428 deletions

View file

@ -32,7 +32,7 @@
</p>
<p>
August 14, 2020
December 27, 2020
</p>
</center>
@ -747,10 +747,10 @@
</dt>
<dd>
Disable the control buttons shown when using the <b>Shapes</b>
tool that allow changing how shapes are drawn &mdash;
centered around the initial mouse click, or with a corner
at the initial mouse click.
Disable the control buttons shown when using the
<b>Shapes</b> tool that allow changing how shapes are
drawn — centered around the initial mouse click, or with
a corner at the initial mouse click.
</dd>
<dt>
@ -1459,7 +1459,7 @@
<p>
As an example, you can see the default colors currently
used in Tux&nbsp;Paint in: "<a href=
"../default_colors.txt"><code>default_colors.txt</code></a>".
"../../default_colors.txt"><code>default_colors.txt</code></a>".
</p>
<p>