Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-11-19 03:05:14 +00:00
Code Issues Projects Releases Wiki Activity
11,708 Commits 1 Branch 17 Tags 75 MiB
3bb58b7c82
Commit Graph

2 Commits

Author SHA1 Message Date
Mariano Alvira
2c9a538582 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into bump-libmc1322x 
bump libmc1322x to 7bee48243c

Conflicts:
	cpu/mc1322x/board/Makefile.board
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/lib/uart1.c
	cpu/mc1322x/lib/uart2.c
	cpu/mc1322x/src/default_lowlevel.c
 2012-11-18 18:27:39 -05:00
Mariano Alvira
59d7fad746 Merge remote branch 'libmc1322x/master' 2011-03-11 16:28:14 -05:00