diff --git a/ChangeLog b/ChangeLog index 6636d0f9c..31db3a363 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-12-14 Matthias Clasen + + * configure.in: Set version to 2.6.0 + 2004-12-13 Tor Lillqvist * NEWS: Update. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6636d0f9c..31db3a363 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2004-12-14 Matthias Clasen + + * configure.in: Set version to 2.6.0 + 2004-12-13 Tor Lillqvist * NEWS: Update. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 6636d0f9c..31db3a363 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2004-12-14 Matthias Clasen + + * configure.in: Set version to 2.6.0 + 2004-12-13 Tor Lillqvist * NEWS: Update. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6636d0f9c..31db3a363 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2004-12-14 Matthias Clasen + + * configure.in: Set version to 2.6.0 + 2004-12-13 Tor Lillqvist * NEWS: Update. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6636d0f9c..31db3a363 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2004-12-14 Matthias Clasen + + * configure.in: Set version to 2.6.0 + 2004-12-13 Tor Lillqvist * NEWS: Update. diff --git a/configure.in b/configure.in index 9d89649f2..dd2781557 100644 --- a/configure.in +++ b/configure.in @@ -26,9 +26,9 @@ m4_include(m4macros/glib-gettext.m4)dnl # set glib_binary_age _and_ glib_interface_age to 0. # m4_define([glib_major_version], [2]) -m4_define([glib_minor_version], [5]) -m4_define([glib_micro_version], [8]) -m4_define([glib_interface_age], [3]) +m4_define([glib_minor_version], [6]) +m4_define([glib_micro_version], [0]) +m4_define([glib_interface_age], [0]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) m4_define([glib_version],