From 3382c079da26c3e5b02fb68764ffd8e2834e4806 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Wed, 18 Mar 2015 15:04:57 +0530 Subject: [PATCH] Fix up NEWS merge goof-up --- NEWS | 11 ++++++----- 1 file 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 -- 2.11.4.GIT