osd-contiki/apps/er-coap-07
Matthias Kovatsch de82815186 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
Conflicts:
	apps/er-coap-06/er-coap-06-engine.c
	apps/er-coap-06/er-coap-06-observing.c
	apps/er-coap-06/er-coap-06-separate.c
	apps/er-coap-06/er-coap-06-transactions.c
	apps/er-coap-06/er-coap-06.c

Removed er-coap-06.
2012-01-30 01:30:49 +01:00
..
er-coap-07-engine.c Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-01-30 01:30:49 +01:00
er-coap-07-engine.h Added Erbium REST engine with new CoAP implementation 2011-09-14 16:33:01 +02:00
er-coap-07-observing.c Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-01-30 01:30:49 +01:00
er-coap-07-observing.h Added Erbium REST engine with new CoAP implementation 2011-09-14 16:33:01 +02:00
er-coap-07-separate.c Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-01-30 01:30:49 +01:00
er-coap-07-separate.h Added Erbium REST engine with new CoAP implementation 2011-09-14 16:33:01 +02:00
er-coap-07-transactions.c Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-01-30 01:30:49 +01:00
er-coap-07-transactions.h Renamed CoAP transaction ID (tid) to message ID (mid). 2012-01-28 19:21:13 +01:00
er-coap-07.c Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-01-30 01:30:49 +01:00
er-coap-07.h Moved status code API from REST engine to main coap implementation. 2012-01-30 01:28:43 +01:00
Makefile.er-coap-07 Added Erbium REST engine with new CoAP implementation 2011-09-14 16:33:01 +02:00