diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-06-15 17:47:41 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-06-15 17:47:41 -0600 |
| commit | c5cfc0d6e507d093987741b6ffaf69ebb24caa4b (patch) | |
| tree | a75b83343939e96592ac07178f2011d82ea6ded8 /src/Makefile | |
| parent | 1b3d07ede530fa40cb7257fb1725c969ba60e0f0 (diff) | |
| parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) | |
Merge branch 'branch-1.4' into debian
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 392262d4..4e8b3c20 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,8 +30,10 @@ 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 + telescience-v0.2 telescience-v0.2/flash-loader \ + teleballoon-v2.0 ARMM0DIRS=\ easymini-v1.0 easymini-v1.0/flash-loader |