[commits] r9241 - in /trunk/libc: ChangeLog version.h

[joseph@xxxxxxxxxx]

Author: joseph
Date: Thu Nov 12 13:00:57 2009
New Revision: 9241

Log:
Merge changes between r9222 and r9240 from /fsf/trunk.

Modified:
    trunk/libc/ChangeLog
    trunk/libc/version.h

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Thu Nov 12 13:00:57 2009
@@ -1,3 +1,7 @@
+2009-11-12  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* version.h: Bump for 2.12 development.
+
 2009-11-10  Andreas Schwab  <schwab@xxxxxxxxxx>
 
 	* resolv/mapv4v6hostent.h (map_v4v6_hostent): Return non-zero if

Modified: trunk/libc/version.h
==============================================================================
--- trunk/libc/version.h (original)
+++ trunk/libc/version.h Thu Nov 12 13:00:57 2009
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
-#define RELEASE "stable"
-#define VERSION "2.11"
+#define RELEASE "development"
+#define VERSION "2.11.90"