Merge branch 'master' into ppp-new

This commit is contained in:
Sylvain Rochet 2013-04-26 19:54:01 +02:00
commit 434daf87c2
3 changed files with 1780 additions and 1773 deletions

View File

@ -145,8 +145,15 @@ 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-08-13
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
* api_msg.c: patch #8008 Fix a potential null pointer dereference in assert
2013-04-24: Simon Goldschmidt
* igmp.c: fixed possible division by zero

File diff suppressed because it is too large Load Diff

View File

@ -45,7 +45,7 @@
#if LWIP_IPV6 /* don't build if not configured for use in lwipopts.h */
//#include "lwip/ip.h"
/* #include "lwip/ip.h" */
#include "lwip/ip6_addr.h"
#include "lwip/def.h"
#include "lwip/pbuf.h"