diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-12-25 10:44:14 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-12-25 10:44:14 +0000 |
| commit | 28c5710e0d8071ca674ea390549c1b9e969ccde2 (patch) | |
| tree | 848cde9c3f01190d14eab4350f52e95a09c0a36a | |
| parent | 105320fa7b3665877cb3c50c821d10cf7ce154d0 (diff) | |
| download | eglibc2-28c5710e0d8071ca674ea390549c1b9e969ccde2.tar.gz | |
Merge changes between r22029 and r22062 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22063 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog | 6 | ||||
| -rw-r--r-- | libc/NEWS | 5 | ||||
| -rw-r--r-- | libc/include/features.h | 2 | ||||
| -rw-r--r-- | libc/version.h | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/libc/ChangeLog b/libc/ChangeLog index dd86c27ce..86350e360 100644 --- a/libc/ChangeLog +++ b/libc/ChangeLog @@ -1,3 +1,9 @@ +2012-12-25 David S. Miller <davem@davemloft.net> + + * version.h (RELEASE): Set to "development". + (VERSION): Set to "2.17.90". + * NEWS: Add 2.18 section. + 2012-12-21 David S. Miller <davem@davemloft.net> * po/hr.po: Update from translation team. @@ -5,6 +5,11 @@ See the end for copying conditions. Please send GNU C library bug reports via <http://sourceware.org/bugzilla/> using `glibc' in the "product" field. +Version 2.18 + +* The following bugs are resolved with this release: + + Version 2.17 * The following bugs are resolved with this release: diff --git a/libc/include/features.h b/libc/include/features.h index c69fc2da2..b624d36cd 100644 --- a/libc/include/features.h +++ b/libc/include/features.h @@ -356,7 +356,7 @@ /* Major and minor version number of the GNU C library package. Use these macros to test for features in specific releases. */ #define __GLIBC__ 2 -#define __GLIBC_MINOR__ 16 +#define __GLIBC_MINOR__ 17 #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) diff --git a/libc/version.h b/libc/version.h index 57b9ec22c..7d9b681a0 100644 --- a/libc/version.h +++ b/libc/version.h @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ #define RELEASE "development" -#define VERSION "2.16.90" +#define VERSION "2.17.90" |