aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2009-10-11 21:51:54 +0300
committerPetri Lehtinen <petri@digip.org>2009-10-11 21:51:54 +0300
commitca7703fbd127a6279e9842a843f317a639db87e2 (patch)
tree60438f2bd9b15897775bb54faeea5f54dab13d0e /configure.ac
parent1e00cd58a514a61e829e639f1e40dac94a334561 (diff)
parent12cd4e8c093476b596012a7f5f4840fac69d1605 (diff)
downloadjansson-ca7703fbd127a6279e9842a843f317a639db87e2.zip
jansson-ca7703fbd127a6279e9842a843f317a639db87e2.tar.gz
jansson-ca7703fbd127a6279e9842a843f317a639db87e2.tar.bz2
Merge branch '1.0'
Conflicts: configure.ac doc/conf.py
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 2835ad3..c2de72f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_PREREQ([2.63])
-AC_INIT([jansson], [1.0.3+], [petri@digip.org])
+AC_PREREQ([2.59])
+AC_INIT([jansson], [1.0.4+], [petri@digip.org])
AM_INIT_AUTOMAKE([1.10 foreign])