Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-01-03 11:30:53 +00:00
Code Issues Projects Releases Wiki Activity
a08fc6a381
contiki/cpu/mc1322x/tools/ftditools
History
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
..
bbmc.c Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into bump-libmc1322x 2012-11-18 18:27:39 -05:00
Makefile Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into bump-libmc1322x 2012-11-18 18:27:39 -05:00