Set master for 2.5 development mode
This commit is contained in:
parent
3279aacdee
commit
5804e9de9b
@ -1,5 +1,5 @@
|
|||||||
AC_PREREQ([2.60])
|
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])
|
AM_INIT_AUTOMAKE([1.10 foreign])
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ copyright = u'2009-2012, Petri Lehtinen'
|
|||||||
# built documents.
|
# built documents.
|
||||||
#
|
#
|
||||||
# The short X.Y version.
|
# The short X.Y version.
|
||||||
version = '2.4'
|
version = '2.5-dev'
|
||||||
# The full version, including alpha/beta/rc tags.
|
# The full version, including alpha/beta/rc tags.
|
||||||
release = version
|
release = version
|
||||||
|
|
||||||
|
@ -22,10 +22,10 @@ extern "C" {
|
|||||||
|
|
||||||
#define JANSSON_MAJOR_VERSION 2
|
#define JANSSON_MAJOR_VERSION 2
|
||||||
#define JANSSON_MINOR_VERSION 4
|
#define JANSSON_MINOR_VERSION 4
|
||||||
#define JANSSON_MICRO_VERSION 0
|
#define JANSSON_MICRO_VERSION 99
|
||||||
|
|
||||||
/* Micro version is omitted if it's 0 */
|
/* 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
|
/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
|
||||||
for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
|
for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
|
||||||
|
Loading…
Reference in New Issue
Block a user