about summary refs log tree commit diff
path: root/NEWS
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-05-27 08:37:18 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-27 08:37:18 -0400
commitfdc2fefe46db79f0a19f690531cd775fbbc2740f (patch)
tree0a5761e16b7e1685e72c09862390fb96c17fd702 /NEWS
parente57420c6c67b914abb01f7c3b1d999795121ce70 (diff)
parentea486f691d34ef2a28d06bb507ac3352e32e1f13 (diff)
downloadglibc-fdc2fefe46db79f0a19f690531cd775fbbc2740f.tar.gz
glibc-fdc2fefe46db79f0a19f690531cd775fbbc2740f.tar.xz
glibc-fdc2fefe46db79f0a19f690531cd775fbbc2740f.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
	NEWS
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1558ba4605..2cdb0cc425 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ Version 2.14
   12545, 12551, 12582, 12583, 12587, 12597, 12601, 12611, 12625, 12626,
   12631, 12650, 12653, 12655, 12660, 12671, 12681, 12685, 12711, 12713,
   12714, 12717, 12723, 12724, 12734, 12738, 12746, 12766, 12775, 12777,
-  12782, 12788, 12792, 12814
+  12782, 12788, 12792, 12795, 12814
 
 * The RPC implementation in libc is obsoleted.  Old programs keep working
   but new programs cannot be linked with the routines in libc anymore.