From 84be06c4da23acb060d0e4e56dca126f20b483e7 Mon Sep 17 00:00:00 2001
From: likewise <likewise>
Date: Fri, 23 Apr 2004 16:51:13 +0000
Subject: [PATCH] Mention the merged fixed from HEAD.

---
 CHANGELOG | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fc1c88ee..58cdca80 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-TODO
+FUTURE
 
   * TODO: The lwIP source code makes some invalid assumptions on processor
     word-length, storage sizes and alignment. See the mailing lists for
@@ -7,16 +7,18 @@ TODO
 
 HISTORY
 
-(active STABLE-0_7 branch)
+(STABLE-0_7 branch)
 
   ++ Bug fixes:
 
-  Merged several compilation and documentation fixes from HEAD.
-
   2004-04-23 Leon Woestenberg <leon.woestenberg@gmx.net>
   * memp.c: Fixed cast in mem_malloc().
   * sockets.c, tcp_in.c, udp.c: #ifdef SO_REUSE now #if SO_REUSE.
   * dhcp.c: #if LWIP_DHCP fixed.
+  * etharp.c: Fixed the case where the packet that initiates the ARP request
+    is not queued, and gets lost. Fixed the case where the packets destination
+    address is already known; we now always queue the packet and perform an ARP
+    request.
 
   2004-03-23 Leon Woestenberg <leon.woestenberg@gmx.net>
   * tcp.c: #ifdef SO_REUSE now #if SO_REUSE.