From 84bb8ee64084f251955526275154b4be8e3a2e3b Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Sat, 17 Dec 2005 18:21:46 +0000 Subject: [PATCH] * Updated for main branch. --- ChangeLog | 5 +++++ configure.ac | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d90fa3b..fb04bac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-17 Richard B. Kreckel + + * Created branch cln_1-1 for maintenance patches. + This is the main branch, which will eventually become CLN 1.2.0. + 2005-12-15 Dmitry V. Kustov * src/base/random/cl_random_from.cc: Add support for OpenBSD. diff --git a/configure.ac b/configure.ac index 1e6ce03..37ebf1d 100644 --- a/configure.ac +++ b/configure.ac @@ -82,8 +82,8 @@ dnl * if any functions/classes have been added, increment CL_AGE, dnl * if backwards compatibility has been broken, set CL_AGE to 0. dnl $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) results in dnl libcln.so.$(CL_CURRENT)-$(CL_AGE) -CL_CURRENT=4 -CL_REVISION=1 +CL_CURRENT=5 +CL_REVISION=0 CL_AGE=0 dnl make substitutions AC_SUBST(CL_CURRENT) @@ -91,8 +91,8 @@ AC_SUBST(CL_REVISION) AC_SUBST(CL_AGE) dnl release version CL_VERSION_MAJOR=1 -CL_VERSION_MINOR=1 -CL_VERSION_PATCHLEVEL=11 +CL_VERSION_MINOR=2 +CL_VERSION_PATCHLEVEL=0 dnl release version for cln/config.h, so it can be tested by the preprocessor AC_DEFINE_UNQUOTED(CL_VERSION_MAJOR, $CL_VERSION_MAJOR) AC_DEFINE_UNQUOTED(CL_VERSION_MINOR, $CL_VERSION_MINOR)