Conflicts:
CHANGES
configure.ac
doc/conf.py
AC_PREREQ([2.59])
- AC_INIT([jansson], [1.1+], [petri@digip.org])
-AC_INIT([jansson], [1.1.1], [petri@digip.org])
++AC_INIT([jansson], [1.1.1+], [petri@digip.org])
AM_INIT_AUTOMAKE([1.10 foreign])
# The short X.Y version.
version = '1.1'
# The full version, including alpha/beta/rc tags.
- release = '1.1+'
-release = '1.1.1'
++release = '1.1.1+'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.