[Pkg-gnupg-commit] [libgpg-error] 04/29: Fix last merge.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository libgpg-error.

commit 80ec003f328ee8180a63585d196a8d40e6045b39
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jan 3 16:32:12 2017 +0100

    Fix last merge.
    
    --
---
 NEWS         | 6 +++++-
 configure.ac | 2 +-
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libgpg-error.git