[commits] r11187 - in /branches/eglibc-2_12/libc: ChangeLog NOTES version.h

[joseph@xxxxxxxxxx]

Author: joseph
Date: Sun Aug  8 07:44:01 2010
New Revision: 11187

Log:
Merge changes between r10808 and r11186 from /fsf/glibc-2_12-branch.

Modified:
    branches/eglibc-2_12/libc/ChangeLog
    branches/eglibc-2_12/libc/NOTES
    branches/eglibc-2_12/libc/version.h

Modified: branches/eglibc-2_12/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_12/libc/ChangeLog (original)
+++ branches/eglibc-2_12/libc/ChangeLog Sun Aug  8 07:44:01 2010
@@ -1,3 +1,7 @@
+2010-07-27  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* version.h (VERSION): Bump for 2.12.1 release.
+
 2010-06-02  Kirill A. Shutemov  <kirill@xxxxxxxxxxxxx>
 
 	* elf/dl-reloc.c: Flush cache after solving TEXTRELs if arch

Modified: branches/eglibc-2_12/libc/NOTES
==============================================================================
--- branches/eglibc-2_12/libc/NOTES (original)
+++ branches/eglibc-2_12/libc/NOTES Sun Aug  8 07:44:01 2010
@@ -184,7 +184,7 @@
 
      Note that if you do this, you must link your program with the BSD
      compatibility library by passing the `-lbsd-compat' option to the
-     compiler or linker.  *Note:* If you forget to do this, you may get
+     compiler or linker.  *NB:* If you forget to do this, you may get
      very strange errors at run time.
 
  -- Macro: _REENTRANT

Modified: branches/eglibc-2_12/libc/version.h
==============================================================================
--- branches/eglibc-2_12/libc/version.h (original)
+++ branches/eglibc-2_12/libc/version.h Sun Aug  8 07:44:01 2010
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "stable"
-#define VERSION "2.12"
+#define VERSION "2.12.1"