summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-07-24 16:04:00 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-07-24 16:04:00 +0200
commitee0b8fbd51519660d917f6d9309ae9a2c097c976 (patch)
treeacfb8a307e43533ba11fdd38c9f2f596a6d71de1
parentdd7bfa5b86e350c8b789380949cde3bb013b33b0 (diff)
parent382bd0679138ea1a7c73506369a133a91e2220e6 (diff)
downloaddabmod-ee0b8fbd51519660d917f6d9309ae9a2c097c976.tar.gz
dabmod-ee0b8fbd51519660d917f6d9309ae9a2c097c976.tar.bz2
dabmod-ee0b8fbd51519660d917f6d9309ae9a2c097c976.zip
Merge branch 'master' into next
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c119b10..a1d6853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
This file contains information about the changes done to
the ODR-DabMod in this repository
+2015-07-24: Matthias P. Braendli <matthias@mpb.li>
+ (v0.5.3)
+ * odr-dabmod:
+ Replace zmq.hpp to support version 4.1.x
+
2015-04-10: Matthias P. Braendli <matthias@mpb.li>
(v0.5.2)
* odr-dabmod:
diff --git a/configure.ac b/configure.ac
index 5c3235c..0de0b22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
# along with ODR-DabMod. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.59)
-AC_INIT([ODR-DabMod], [0.5.2], [matthias.braendli@mpb.li])
+AC_INIT([ODR-DabMod], [0.5.3], [matthias.braendli@mpb.li])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM