diff options
| author | Petri Lehtinen <petri@digip.org> | 2011-03-31 21:26:19 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2011-03-31 21:26:19 +0300 |
| commit | 4a76900bd7f52ddaea44bd81a2666a4378a553f6 (patch) | |
| tree | fe898ac703c0c2b6b624e93bb7ec5c6d95c90b2c /configure.ac | |
| parent | 056702e541b7b977cc5109113fa25bc580c7bdf3 (diff) | |
| parent | 1c0a3b2a556be9800e307413d41d4f040d1db062 (diff) | |
| download | jansson-4a76900bd7f52ddaea44bd81a2666a4378a553f6.zip jansson-4a76900bd7f52ddaea44bd81a2666a4378a553f6.tar.gz jansson-4a76900bd7f52ddaea44bd81a2666a4378a553f6.tar.bz2 | |
Merge branch '2.0'
Conflicts:
doc/conf.py
src/jansson.h
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 6ff975e..c056f6c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([jansson], [2.0], [petri@digip.org]) +AC_INIT([jansson], [2.0.1+git], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) |