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
|
11f5bca7c4
|
Merge remote branch 'libmc1322x/master'
Conflicts:
cpu/mc1322x/board/redbee-econotag.h
|
2011-03-22 16:28:08 -04:00 |
|
|
Mariano Alvira
|
59d7fad746
|
Merge remote branch 'libmc1322x/master'
|
2011-03-11 16:28:14 -05:00 |
|
|
Mariano Alvira
|
fa08b09770
|
Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into update-lib
|
2011-03-07 12:37:26 -05:00 |
|
|
Mariano Alvira
|
2e331b51e8
|
Merge remote branch 'libmc1322x/master' into update-libmc1322x
Conflicts:
cpu/mc1322x/COPYING
|
2011-02-17 14:41:47 -05: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 |
|