Merge branch 'dev' into work/v1.7

# Conflicts:
#	CMakeLists.txt

2 files changed, 41 insertions, 1 deletions

diff --git a/res/about/version.gmi b/res/about/version.gmi
index 1fce4188..89e81047 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,16 @@
 ```
 # Release notes
 
+## 1.6.4
+* Local files containing UTF-8 text can be viewed regardless of their file extension.
+* Fixed input field cursor positioning and insertion problems around Emoji variation selectors.
+* Fixed "Unknown Status Code" shown in Page Information for valid status codes.
+* Fixed an issue with network requests that would make it appear the server was not responding, but the request would not time out.
+* Fixed a potential invalid memory access when clicking on sidebar items.
+* OpenBSD: Fixed a freeze after a network request is cancelled.
+* Fixed page contents not reflowing during a window resize.
+* Added build option ENABLE_RESIZE_DRAW. SDL doesn't redraw window contents on all platforms during resizing, so this can be used to force it.
+
 ## 1.6.3
 * Select all text in an input field using Shift+Ctrl+A (macOS: ⌘A).
 * Input fields do not lose focus when the window becomes inactive, making it easier to resume input afterwards.
diff --git a/res/fi.skyjake.Lagrange.appdata.xml b/res/fi.skyjake.Lagrange.appdata.xml
index 0259aa1e..4202a9b6 100644
--- a/res/fi.skyjake.Lagrange.appdata.xml
+++ b/res/fi.skyjake.Lagrange.appdata.xml
@@ -45,6 +45,36 @@
     <update_contact>jaakko.keranen@iki.fi</update_contact>
 
     <releases>
+        <release version="1.6.4" date="2021-08-22">
+            <description>
+                <p>Version 1.6 adds support for bidirectional text and complex scripts,
+                    right-to-left paragraph layout, uploads using the Titan protocol,
+                    and has an improved mechanism for tracking trust in server
+                    certificates. Page contents can be fully cached in memory for more
+                    efficient backward navigation. There are also UI improvements like
+                    a reorganized Preferences and a setting for smooth scrolling
+                    speed.</p>
+                <p>Changes and fixes in v1.6.4:</p>
+                <ul>
+                    <li>Local files containing UTF-8 text can be viewed regardless of
+                        their file extension.</li>
+                    <li>Fixed input field cursor positioning and insertion problems
+                        around Emoji variation selectors.</li>
+                    <li>Fixed "Unknown Status Code" shown in Page Information for
+                        valid status codes.</li>
+                    <li>Fixed an issue with network requests that would make it appear
+                        the server was not responding, but the request would not time
+                        out.</li>
+                    <li>Fixed a potential invalid memory access when clicking on
+                        sidebar items.</li>
+                    <li>Fixed a potential freeze after a network request is
+                        cancelled.</li>
+                </ul>
+                <p>The full release notes can be viewed inside the app by opening
+                    the "about:version" page.</p>
+            </description>
+            <url>https://github.com/skyjake/lagrange/releases/tag/v1.6.4</url>
+        </release>
         <release version="1.6.3" date="2021-08-15">
             <description>
                 <p>Version 1.6 adds support for bidirectional text and complex scripts,
@@ -78,7 +108,7 @@
                     the "about:version" page.</p>
             </description>
             <url>https://github.com/skyjake/lagrange/releases/tag/v1.6.3</url>
-        </release>        
+        </release>
         <release version="1.6.2" date="2021-08-03">
             <description>
                 <p>Version 1.6 adds support for bidirectional text and complex scripts,