diff options
| author | Petri Lehtinen <petri@digip.org> | 2010-04-03 14:00:59 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2010-04-03 14:00:59 +0300 |
| commit | 8857aeadfdbe1923f229ab5a4b4c371986a8de2e (patch) | |
| tree | d8a8c13d3b239f3538c4d7d29d3fbea9aa9baf78 /configure.ac | |
| parent | 4e63fcd55d874485071073f181dbfc5b9e196600 (diff) | |
| parent | 047a1417fb4f09f995eb2671ee52253f7f1e1e76 (diff) | |
| download | jansson-8857aeadfdbe1923f229ab5a4b4c371986a8de2e.zip jansson-8857aeadfdbe1923f229ab5a4b4c371986a8de2e.tar.gz jansson-8857aeadfdbe1923f229ab5a4b4c371986a8de2e.tar.bz2 | |
Merge branch '1.2'
Conflicts:
CHANGES
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 9a4bd99..a42a99c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([jansson], [1.2+], [petri@digip.org]) +AC_INIT([jansson], [1.2.1+], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) |