diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-12-20 21:18:27 +0200 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-12-21 12:52:25 +0200 |
| commit | e7a5dc58e630aa079f402b46a65d218e656dd489 (patch) | |
| tree | a4b36a00e6f569c8630d7ff2b7071ef640d3d7e5 /configure.ac | |
| parent | 3889af476ba52e98de210e8e0b3b4a44a26b3a60 (diff) | |
| parent | 34fb97998cfeb4ae6f4bc9450c9144bd7572c1f6 (diff) | |
| download | jansson-e7a5dc58e630aa079f402b46a65d218e656dd489.zip jansson-e7a5dc58e630aa079f402b46a65d218e656dd489.tar.gz jansson-e7a5dc58e630aa079f402b46a65d218e656dd489.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 4020469..d28a5e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.59]) -AC_INIT([jansson], [1.1.2+], [petri@digip.org]) +AC_INIT([jansson], [1.1.3+], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) |