projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
607fbb0
9ab3a1d
)
Merge tag '1.4' into fox
author
Keith Packard
<keithp@keithp.com>
Wed, 16 Jul 2014 05:55:20 +0000
(22:55 -0700)
committer
Keith Packard
<keithp@keithp.com>
Wed, 16 Jul 2014 05:55:20 +0000
(22:55 -0700)
tagging 1.4 release
Conflicts:
src/Makefile
1
2
src/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/Makefile
index 1453720c43f410b1715cbccedf6f42c1864e176f,4e8b3c20c6a94562676cd67fffb28606b5b441b8..a9fe335e7b439477119666a05ef2af83fb2f4008
---
1
/
src/Makefile
---
2
/
src/Makefile
+++ b/
src/Makefile
@@@
-31,9
-30,10
+30,11
@@@
ARMM3DIRS=
telemetrum-v2.0 telemetrum-v2.0/flash-loader \
megadongle-v0.1 megadongle-v0.1/flash-loader \
telegps-v0.3 telegps-v0.3/flash-loader \
+ telegps-v1.0 telegps-v1.0/flash-loader \
telelco-v0.2 telelco-v0.2/flash-loader \
telescience-v0.2 telescience-v0.2/flash-loader \
- fox1ihu fox1ihu/flash-loader
++ fox1ihu fox1ihu/flash-loader \
+ teleballoon-v2.0
ARMM0DIRS=\
easymini-v1.0 easymini-v1.0/flash-loader