[taler-merchant] branch master updated: fix 'make dist' target, bump version

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 4a7e8a1  fix 'make dist' target, bump version
4a7e8a1 is described below

commit 4a7e8a155522d87e27ebbfc651d1fb3387703934
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Dec 20 20:37:05 2019 +0100

    fix 'make dist' target, bump version
---
 ChangeLog    | 7 +++++--
 Makefile.am  | 3 +--
 configure.ac | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fa7767e..8425aa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
+Fri 20 Dec 2019 08:36:03 PM CET
+       Releasing taler-merchant 0.6.0. -CG
+
 Sat 17 Aug 2019 10:03:38 PM CEST
-    Remove "currency" field from exchange database, as we only
-    support one currency per merchant backend anyway. -CG
+       Remove "currency" field from exchange database, as we only
+       support one currency per merchant backend anyway. -CG
 
 Wed Apr  4 00:19:38 CEST 2018
        Releasing taler-merchant-0.5.0 -FD
diff --git a/Makefile.am b/Makefile.am
index 9309390..ab67ba6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,7 @@ EXTRA_DIST = \
  COPYING.AGPL \
  COPYING.LGPL \
  contrib/gnunet.tag \
- contrib/microhttpd.tag \
- Doxyfile
+ contrib/microhttpd.tag 
 
 app:
        mkdir -p $(PACKAGE)-frontend-$(VERSION)-app
diff --git a/configure.ac b/configure.ac
index a5bb3be..f01f90f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # This configure file is in the public domain
 
 AC_PREREQ([2.69])
-AC_INIT([taler-merchant], [0.5.0], [address@hidden])
+AC_INIT([taler-merchant], [0.6.0], [address@hidden])
 AC_CONFIG_SRCDIR([src/backend/taler-merchant-httpd.c])
 AC_CONFIG_HEADERS([taler_merchant_config.h])
 # support for non-recursive builds

-- 
To stop receiving notification emails like this one, please contact
address@hidden.