diff options
| author | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
| commit | 3cf030fffffd223c3717011e03aac82346295d71 (patch) | |
| tree | b6da4fbb1180b75bedb86ce608503a6c0aeb47f3 /src/Makefile | |
| parent | 607fbb01710be1cb263625337f5be3d0fb48d5e7 (diff) | |
| parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) | |
Merge tag '1.4' into fox
tagging 1.4 release
Conflicts:
src/Makefile
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 1453720c..a9fe335e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,11 +19,10 @@ include Makedefs SDCCDIRS=\ telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \ teledongle-v0.2 \ - telemini-v1.0 \ + telemini-v1.0 telemini-v2.0 \ telebt-v1.0 \ teleterra-v0.2 teleshield-v0.1 \ - telefire-v0.1 telefire-v0.2 \ - telemini-v2.0 + telefire-v0.1 telefire-v0.2 ARMM3DIRS=\ telemega-v0.1 telemega-v0.1/flash-loader \ @@ -31,9 +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 |