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 |
|
Nicholas J Humfrey
|
a561d20828
|
Converted u8_t to uint8_t and u16_t to uint16_t in the examples directory.
|
2012-02-21 08:33:25 -05:00 |
|
Matthias Kovatsch
|
f23e86f589
|
Moved status code API from REST engine to main coap implementation.
|
2012-01-30 01:28:43 +01:00 |
|
Matthias Kovatsch
|
2240289d1f
|
Erbium code cleanup.
|
2012-01-28 18:52:14 +01:00 |
|
Matthias Kovatsch
|
c861ce0197
|
Fixed Erbium bugs (ext. header, client request path) and added server resource config defines.
|
2012-01-12 20:19:54 +01:00 |
|
Matthias Kovatsch
|
f71b0bc794
|
Added Erbium REST engine with new CoAP implementation
|
2011-09-14 16:33:01 +02:00 |
|