- removed include instead of commenting it out;

- CHANGELOG should contain worthy entries only, a complete log of all source code changes can be found in git (I'm not saying this has always been observed, but I'd like to keep the list of changes as short as possible for anyone to read if interested)

diff --git a/CHANGELOG b/CHANGELOG
index 00ae7c86a90279ca273846e6dab694c2f8143695..68954d96324667b4a1cd030907c1ee7e602a8001 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -80,13 +80,6 @@ HISTORY
 
  ++ Bugfixes:
 
-  2013-04-26: Sylvain Rochet
-  * dhcp.c, reverted from DOS (CRLF) to UNIX format (LF), it was saved in DOS format
-    by mistake the 2012-09-26
-
-  2013-04-26: Sylvain Rochet
-  * ip6.h, cleared compilation warning, C++ style comments are not allowed in ISO C90
-
   2013-04-24: patch by Liam <morepork>
   * api_msg.c: patch #8008 Fix a potential null pointer dereference in assert
 

diff --git a/src/include/ipv6/lwip/ip6.h b/src/include/ipv6/lwip/ip6.h
index 027a20be0c5e3b4b09bf5134af7b9bf11e6c4f15..ac32ceecf58f18b1af1c3c609040d33b6500ba60 100644 (file)
--- a/src/include/ipv6/lwip/ip6.h
+++ b/src/include/ipv6/lwip/ip6.h
@@ -45,7 +45,6 @@
 
 #if LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
 
-/* #include "lwip/ip.h" */
 #include "lwip/ip6_addr.h"
 #include "lwip/def.h"
 #include "lwip/pbuf.h"