Commit Graph
2 Commits
Author SHA1 Message Date
Olaf Bergmann ebb00c4dfe Merge remote-tracking branch 'coap-lwip/chrysn-lwip-fixes' into develop
Conflicts:
	coap_io.h
	mem.h
	net.c
	pdu.c
2015-02-14 20:45:48 +01:00
Olaf Bergmann c47d2fea3c renamed config.h to coap_config.h to avoid name clashes 2014-09-15 17:31:54 +02:00