Enric M. Calvo
|
1716d837fc
|
Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup
Makefile.z1 is broken into .common and .z1 to share it with Z1 Starter Platform
Conflicts:
.gitignore
platform/z1/Makefile.z1
|
2011-03-25 17:46:38 +01:00 |
|
Mariano Alvira
|
b7baf22a02
|
add .gitignore and ignore generated files
|
2011-03-12 09:06:38 -05:00 |
|
|
Enric M. Calvo
|
b83a440c19
|
modified gitignore
|
2011-03-08 12:04:34 +01:00 |
|
|
Enric M. Calvo
|
d971578f1e
|
modified .gitignore
|
2011-02-26 12:37:08 +01:00 |
|
Enric
|
49e5f383b5
|
updated .gitignore with _del/ and tools/
|
2011-02-26 07:22:37 +01:00 |
|
|
Enric M. Calvo
|
44ce1699f2
|
Definition of Z1 Starter Platform in contiki/platforms + LEDs + Potentiometer
|
2011-02-25 16:08:50 +01:00 |
|
|
Enric M. Calvo
|
74836c344a
|
.gitignore file added
|
2011-02-25 16:01:40 +01:00 |
|