Commit Graph

5 Commits

Author SHA1 Message Date
Mariano Alvira
e2d74fa0a5 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into uart-upstream
Conflicts:
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/src/default_lowlevel.c
2011-07-08 19:21:15 -04:00
maralvira
68180c0574 use network 230 --- 802.15.4 no-FCS 2011-01-18 16:58:18 +00:00
maralvira
6fb75263f9 fix parsing and pcap generation for packets with multiple output lines
(those that are > 16 bytes).
2011-01-17 15:47:23 +00:00
maralvira
d82b004154 fix parsing and pcap generation for packets with multiple output lines
(those that are > 16 bytes).
2011-01-17 15:47:08 +00:00
maralvira
419906a769 initial mc1322x commit
based on commit aac3a355451d899f02737f2907af8c874ee4feba of

git://git.devl.org/git/malvira/contiki-mc1322x.git
2010-06-10 14:55:39 +00:00