aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-01-03 15:32:12 +0000
committerWerner Koch <[email protected]>2017-01-03 15:32:27 +0000
commit80ec003f328ee8180a63585d196a8d40e6045b39 (patch)
tree46c170b777420190b65a8eea2fd9403f50b4b8c1
parentMerge branch 'release-1.26' (diff)
downloadlibgpg-error-80ec003f328ee8180a63585d196a8d40e6045b39.tar.gz
libgpg-error-80ec003f328ee8180a63585d196a8d40e6045b39.zip
Fix last merge.
--
-rw-r--r--NEWS6
-rw-r--r--configure.ac2
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 21637bc..b19fd11 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
-Noteworthy changes in version 1.26 (unreleased) [C20/A20/R_]
+Noteworthy changes in version 1.27 (unreleased) [C2_/A2_/R_]
+-----------------------------------------------
+
+
+Noteworthy changes in version 1.26 (2016-12-21) [C21/A21/R0]
-----------------------------------------------
* New option --desc for gpg-error.
diff --git a/configure.ac b/configure.ac
index e3ca56e..6d4f173 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.14"
# another commit, and a push so that the git magic is able to work.
# See below for the LT versions.
m4_define([mym4_version_major], [1])
-m4_define([mym4_version_minor], [26])
+m4_define([mym4_version_minor], [27])
# Below is m4 magic to extract and compute the revision number, the
# decimalized short revision number, a beta version string, and a flag