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
|
efab964451
|
Converted u8_t to uint8_t and u16_t to uint16_t in the apps directory.
|
2012-02-21 08:33:25 -05:00 |
|
|
Matthias Kovatsch
|
4c3e858df5
|
Made Erbium function parameters const where applicable.\nMinor clean-up.
|
2012-01-20 18:30:12 +01:00 |
|
|
Matthias Kovatsch
|
95af4b88ec
|
Fixed int serialization bug (affected large values).
|
2011-12-07 19:39:43 +01:00 |
|
|
Matthias Kovatsch
|
f71b0bc794
|
Added Erbium REST engine with new CoAP implementation
|
2011-09-14 16:33:01 +02:00 |
|