From 70128cf2b9385fac8aaa8e7fb9c6db9d771d8b9c Mon Sep 17 00:00:00 2001
From: likewise <likewise>
Date: Fri, 23 Apr 2004 15:24:08 +0000
Subject: [PATCH] Mentioned the merge from HEAD.

---
 CHANGELOG | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 47fb80bd..fc1c88ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,8 +11,15 @@ HISTORY
 
   ++ 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.
+
   2004-03-23 Leon Woestenberg <leon.woestenberg@gmx.net>
-  * sockets.c, tcp.c, tcp_in.c, udp.c, : #ifdef SO_REUSE now #if SO_REUSE.
+  * tcp.c: #ifdef SO_REUSE now #if SO_REUSE.
 
   2004-03-11 Leon Woestenberg <leon.woestenberg@gmx.net>
   * dhcp.c: Added missing #if LWIP_DHCP #endif pair.