From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Mon, 6 Apr 2020 06:00:22 +0000 (+0200)
Subject: Stable Release 2.42.4
X-Git-Tag: stable_release_2.42.4^0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=466402bb70105dd74282cd9da6bbde9da02a9b3c;p=graphviz

Stable Release 2.42.4
---

diff --git a/ChangeLog b/ChangeLog
index 0ecacd58a..c39da0657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+April 5, 2020
+    - Release 2.42.4
+	- Merge	1341, 1339, 1338, 1337, 1336, 1327, 1325, 1324, 1335
+	- Patches 1687, 1376, 1647, 1605
+	- Add Ubuntu 19.10 builds to CI/CD
+	- CI/CD source & build stages now run on GitLab hosted runners
+
 October 9, 2019
     - Release 2.42.3
 	- Merge 1316, 1317, 1319, 1320
diff --git a/appveyor.yml b/appveyor.yml
index af49f5c96..6a3012956 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
-version: 2.43.{build}
-#version: 2.42.3
+#version: 2.43.{build}
+version: 2.42.4
 clone_depth: 25
 
 image: Visual Studio 2015
diff --git a/autogen.sh b/autogen.sh
index cfd0345dd..3dbd038e1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -33,16 +33,16 @@ dnl For the micro number: 0 => in-progress development
 dnl                       timestamp => tar-file snapshot or release
 
 dnl uncomment the next 4 lines for development releases, minor version must be odd
-m4_define([graphviz_version_major],[2])
-m4_define([graphviz_version_minor],[43])
-m4_define([graphviz_version_micro],[$GRAPHVIZ_VERSION_DATE])
-m4_define([graphviz_collection],[development])
+dnl m4_define([graphviz_version_major],[2])
+dnl m4_define([graphviz_version_minor],[43])
+dnl m4_define([graphviz_version_micro],[$GRAPHVIZ_VERSION_DATE])
+dnl m4_define([graphviz_collection],[development])
 
 dnl uncomment the next 4 lines for stable releases, minor version must be even
-dnl m4_define([graphviz_version_major],[2])
-dnl m4_define([graphviz_version_minor],[42])
-dnl m4_define([graphviz_version_micro],[3])
-dnl m4_define([graphviz_collection],[stable])
+m4_define([graphviz_version_major],[2])
+m4_define([graphviz_version_minor],[42])
+m4_define([graphviz_version_micro],[4])
+m4_define([graphviz_collection],[stable])
 
 m4_define([graphviz_version_date],[$GRAPHVIZ_VERSION_DATE])
 m4_define([graphviz_change_date],["$GRAPHVIZ_CHANGE_DATE"])