2020/12/02 Merge branch 'master' into sdl2.0

2020-12-02 20:24:43 +01:00 · 2020-12-02 20:24:43 +01:00 · 3b44b4929f
commit 3b44b4929f
parent b857d67f28 71152d1369
6 changed files with 88 additions and 29 deletions
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@ -8,7 +8,7 @@ http://www.tuxpaint.org/

 $Id$

-2020.October.30 (0.9.25)
+2020.November.21 (0.9.25)
  * New Features
    ------------
    * Export drawings:
@ -116,6 +116,10 @@ $Id$
      descriptions, if we failed to know what language to use
      (see above).

+    * Mended bug where a personal Template could not be loaded
+      due to how we tracked which entry in the "New" dialog
+      was the first template image.
+
  * New Translations:
    -----------------

--- a/docs/en/README.txt
+++ b/docs/en/README.txt
@ -6,7 +6,7 @@
          Copyright 2002-2020 by various contributors; see AUTHORS.txt
                            http://www.tuxpaint.org/

-                        June 14, 2002 - August 25, 2020
+                       June 14, 2002 - November 21, 2020

     ----------------------------------------------------------------------

--- a/docs/en/html/README.html
+++ b/docs/en/html/README.html
@ -35,7 +35,7 @@
      </p>

      <p>
-        June 14, 2002 - August 25, 2020
+        June 14, 2002 - November 21, 2020
      </p>
    </center>