From: Siddhesh Poyarekar Date: Sun, 5 Feb 2017 15:57:52 +0000 (+0530) Subject: Open master for development X-Git-Tag: glibc-2.25.90^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58557c229319a3b8d2eefdb62e7df95089eabe37;p=thirdparty%2Fglibc.git Open master for development --- diff --git a/ChangeLog b/ChangeLog index f140ee67de3..6037fef737f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2017-02-05 Siddhesh Poyarekar + * version.h (RELEASE): Set to "development" + (VERSION): Set to 2.25.90. + * NEWS: Add 2.26 section. + * version.h (RELEASE): Set to "stable" (VERSION): Set to 2.25. * include/features.h (__GLIBC_MINOR__): Set to 25. diff --git a/NEWS b/NEWS index ec15dde7613..b5a401c1e38 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,20 @@ See the end for copying conditions. Please send GNU C library bug reports via using `glibc' in the "product" field. + +Version 2.26 + +[Add important changes here] + +Security related changes: + + [Add security related changes here] + +The following bugs are resolved with this release: + + [The release manager will add the list generated by + scripts/list-fixed-bugs.py just before the release.] + Version 2.25 diff --git a/version.h b/version.h index dc2064f01fd..48a40b4a689 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ -#define RELEASE "stable" -#define VERSION "2.25" +#define RELEASE "development" +#define VERSION "2.25.90"