diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-09-08 17:02:39 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-09-08 17:02:39 +0300 |
| commit | 55d25665395551e711fa7d971cf76c8acf0b17f1 (patch) | |
| tree | 981bcca69d805b4382ae1e51d8c4a76e0db1510f /configure.ac | |
| parent | 7ee974e91c05d334b3a186937916bc843c537b8e (diff) | |
| parent | 9cc6fbe58024d63473846ddb424a69b7efc03b90 (diff) | |
| download | jansson-55d25665395551e711fa7d971cf76c8acf0b17f1.zip jansson-55d25665395551e711fa7d971cf76c8acf0b17f1.tar.gz jansson-55d25665395551e711fa7d971cf76c8acf0b17f1.tar.bz2 | |
Merge branch '1.0' into HEAD
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 f7fe011..1ad73a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([jansson], [1.0.1+], [petri@digip.org]) +AC_INIT([jansson], [1.0.2+], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) |