about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-12-23 14:03:55 -0500
committerUlrich Drepper <drepper@gmail.com>2011-12-23 14:03:55 -0500
commitc0da14cdda1fa552262ce3624156194eef43e973 (patch)
tree8c94e822eaac248ea0d42ef9c2c975cc15bcedf1
parent530a32499a1671ea243c4d05e9c82ad31a29c7e6 (diff)
downloadglibc-c0da14cdda1fa552262ce3624156194eef43e973.tar.gz
glibc-c0da14cdda1fa552262ce3624156194eef43e973.tar.xz
glibc-c0da14cdda1fa552262ce3624156194eef43e973.zip
Preliminaries for 2.15 release glibc-2.15
-rw-r--r--ChangeLog3
-rw-r--r--include/features.h2
-rw-r--r--version.h4
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f1a0742f3f..e81ffc170e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-23  Ulrich Drepper  <drepper@gmail.com>
 
+	* version.h (RELEASE): Bump for 2.15 release.
+	* include/features.h (__GLIBC_MINOR__): Bump to 15.
+
 	* sysdeps/x86_64/dl-machine.h: Fix typos in comments.
 	Patch by Marek Polacek <mpolacek@redhat.com>.
 
diff --git a/include/features.h b/include/features.h
index 8f888578fc..c7b7972806 100644
--- a/include/features.h
+++ b/include/features.h
@@ -339,7 +339,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__	14
+#define	__GLIBC_MINOR__	15
 
 #define __GLIBC_PREREQ(maj, min) \
 	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
diff --git a/version.h b/version.h
index a37c4c77d4..1dac42529b 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
-#define RELEASE "development"
-#define VERSION "2.14.90"
+#define RELEASE "stable"
+#define VERSION "2.15"