mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-11-19 18:40:17 +00:00
e2d74fa0a5
Conflicts: cpu/mc1322x/lib/include/uart.h cpu/mc1322x/src/default_lowlevel.c
3.3 KiB
3.3 KiB