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
|
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 |
|
|
Mariano Alvira
|
2e331b51e8
|
Merge remote branch 'libmc1322x/master' into update-libmc1322x
Conflicts:
cpu/mc1322x/COPYING
|
2011-02-17 14:41:47 -05:00 |
|
|
Mariano Alvira
|
2e33e1694a
|
Merge branch 'libmc13-9f82e068' into update-libmc1322x
|
2011-02-17 14:39:20 -05:00 |
|
|
Mariano Alvira
|
81552d1f6d
|
add a tutorial for rest-example
|
2011-02-08 09:08:05 -05:00 |
|
maralvira
|
3426eae031
|
fix typos
|
2010-11-11 20:37:33 +00:00 |
|
|
maralvira
|
1aac14f252
|
add tutorial explaining how to set up an RPL network of econotags
|
2010-11-09 01:30:01 +00:00 |
|