Remove conflicting NEWS change.

This commit is contained in:
Jeff Law 2012-09-20 15:26:38 -06:00
parent 9f609b5c49
commit 5afa20362c

View File

@ -6,19 +6,6 @@
* iconv/gconv_db.c (free_derivation): Likewise.
(__gconv_release_step, gen_steps, increment_counter): Likewise.
diff --git a/NEWS b/NEWS
index d9dfd20..d01c524 100644
--- a/NEWS
+++ b/NEWS
@@ -73,7 +73,7 @@ Version 2.16
14043, 14044, 14048, 14049, 14050, 14053, 14055, 14059, 14064, 14075,
14080, 14083, 14103, 14104, 14109, 14112, 14117, 14122, 14123, 14134,
14153, 14183, 14188, 14199, 14210, 14218, 14229, 14241, 14273, 14277,
- 14278,
+ 14278, 14594
* Support for the x32 ABI on x86-64 added. The x32 target is selected by
configuring glibc with:
diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c
index 90b6cff..9e23708 100644
--- a/iconv/gconv_cache.c