From 5804e9de9bc502de955f2add2b4459a51e9d3518 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sun, 23 Sep 2012 13:41:40 +0300 Subject: [PATCH] Set master for 2.5 development mode --- configure.ac | 2 +- doc/conf.py | 2 +- src/jansson.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3b595a4..91d783f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([jansson], [2.4], [petri@digip.org]) +AC_INIT([jansson], [2.5-dev], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) diff --git a/doc/conf.py b/doc/conf.py index 6010904..1f667ed 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,7 +48,7 @@ copyright = u'2009-2012, Petri Lehtinen' # built documents. # # The short X.Y version. -version = '2.4' +version = '2.5-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/src/jansson.h b/src/jansson.h index 352c6ce..0ac9962 100644 --- a/src/jansson.h +++ b/src/jansson.h @@ -22,10 +22,10 @@ extern "C" { #define JANSSON_MAJOR_VERSION 2 #define JANSSON_MINOR_VERSION 4 -#define JANSSON_MICRO_VERSION 0 +#define JANSSON_MICRO_VERSION 99 /* Micro version is omitted if it's 0 */ -#define JANSSON_VERSION "2.4" +#define JANSSON_VERSION "2.5-dev" /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */