diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-09-06 12:53:38 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-09-06 12:53:38 +0300 |
| commit | fd259ff68c095c613acf952cc63407f294241923 (patch) | |
| tree | 7a6f444415386d8019e51c9604c21a42159b9272 /configure.ac | |
| parent | 9611780907cdb0154bd41232df7b2a41903a4ca5 (diff) | |
| parent | ab2d93b72486eda30e868b226bec5dcd5ec3273e (diff) | |
| download | jansson-fd259ff68c095c613acf952cc63407f294241923.zip jansson-fd259ff68c095c613acf952cc63407f294241923.tar.gz jansson-fd259ff68c095c613acf952cc63407f294241923.tar.bz2 | |
Merge branch '1.0'
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 783e264..f7fe011 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([jansson], [1.0+], [petri@digip.org]) +AC_INIT([jansson], [1.0.1+], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) |