aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2015-03-18 15:04:57 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2015-03-18 15:04:57 +0530
commit3382c079da26c3e5b02fb68764ffd8e2834e4806 (patch)
tree775f397e1573c134315631e83121b9bbaedc4cf7
parented6b0fe710b631b99ed9fc28cefedfe69a16dc55 (diff)
downloadglibc-3382c079da26c3e5b02fb68764ffd8e2834e4806.tar
glibc-3382c079da26c3e5b02fb68764ffd8e2834e4806.tar.gz
glibc-3382c079da26c3e5b02fb68764ffd8e2834e4806.tar.bz2
glibc-3382c079da26c3e5b02fb68764ffd8e2834e4806.zip
Fix up NEWS merge goof-up
-rw-r--r--NEWS11
1 files changed, 6 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 4e1e661864..54c9b90fe4 100644
--- a/NEWS
+++ b/NEWS
@@ -10,11 +10,12 @@ Version 2.22
* The following bugs are resolved with this release:
4719, 13064, 14094, 14841, 14906, 15319, 15467, 15790, 15969, 16351,
- 16512, 16560, 16783, 17269, 17523, 17542, 17569, 17588, 17631, 17711,
- 17776, 17779, 17792, 17836, 17912, 17916, 17932, 17944, 17949, 17964,
- 17965, 17967, 17969, 17978, 17987, 17991, 17996, 17998, 17999, 18019,
- 18020, 18029, 18030, 18032, 18036, 18038, 18039, 18042, 18043, 18046,
- 18047, 18068, 18080, 18093, 18104, 18110, 18111.
+ 16512, 16560, 16783, 17090, 17269, 17523, 17542, 17569, 17588, 17620,
+ 17621, 17628, 17631, 17711, 17776, 17779, 17792, 17836, 17912, 17916,
+ 17932, 17944, 17949, 17964, 17965, 17967, 17969, 17978, 17987, 17991,
+ 17996, 17998, 17999, 18019, 18020, 18029, 18030, 18032, 18036, 18038,
+ 18039, 18042, 18043, 18046, 18047, 18068, 18080, 18093, 18104, 18110,
+ 18111, 18128.
* Character encoding and ctype tables were updated to Unicode 7.0.0, using
new generator scripts contributed by Pravin Satpute and Mike FABIAN (Red