From 8b152439beb81c8da1bdb00c7870e2d9e8d49612 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 03:47:04 +0200
Subject: Merging upstream version 7.0.18-dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 doc/manual/user_ChangeLogImpl.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'doc/manual/user_ChangeLogImpl.xml')

diff --git a/doc/manual/user_ChangeLogImpl.xml b/doc/manual/user_ChangeLogImpl.xml
index ef9aeced..bceaf745 100644
--- a/doc/manual/user_ChangeLogImpl.xml
+++ b/doc/manual/user_ChangeLogImpl.xml
@@ -71,6 +71,33 @@ Rules for adding a changelog entry to make them look more uniform:
 
 <!-- HACK ALERT! Seems we must have a single top level element for xi:include to work.
                            So, we use chapter and xpointer="xpointer(/chapter/)" with xi:include. -->
+  <sect1>
+
+    <title>Version 7.0.18 (2024-05-07)</title>
+
+    <para>This is a maintenance release. The following items were fixed and/or
+      added:</para>
+
+    <itemizedlist>
+
+      <listitem>
+       <para>Networking: Fixed an issue which caused host system crash
+         when VM was using bridged or host-only network adapter (bug #22045)</para>
+      </listitem>
+
+      <listitem>
+       <para>Linux Guest Additions: Added more fixes to prevent UBSAN
+         warnings (bug #21877)</para>
+      </listitem>
+
+      <listitem>
+       <para>Linux Guest Additions: Fixed issue when time stamps were displayed
+         incorrectly within mounted shared folder (bug #22047)</para>
+      </listitem>
+
+    </itemizedlist>
+  </sect1>
+
   <sect1>
 
     <title>Version 7.0.16 (2024-04-16)</title>
-- 
cgit v1.2.3