diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-11-08 22:01:02 +0200 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-11-08 22:01:02 +0200 |
| commit | e0a88d19d1f103c32bbaf4c20a83575413c4bf80 (patch) | |
| tree | 8ae7bd04df1adec1e5f1824f0ba0ecc93054be51 /configure.ac | |
| parent | 17d913307e60d1c3e41d01d9a4be81892d610b3f (diff) | |
| parent | 842bc2128b70e5390cacf83a24375cd5c0d0341c (diff) | |
| download | jansson-e0a88d19d1f103c32bbaf4c20a83575413c4bf80.zip jansson-e0a88d19d1f103c32bbaf4c20a83575413c4bf80.tar.gz jansson-e0a88d19d1f103c32bbaf4c20a83575413c4bf80.tar.bz2 | |
Merge branch '1.1'
Conflicts:
configure.ac
doc/conf.py
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 3a35945..8de9c05 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.59]) -AC_INIT([jansson], [1.1.1+], [petri@digip.org]) +AC_INIT([jansson], [1.1.2+], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) |