From: Keith Packard <keithp@keithp.com>
Date: Wed, 16 Jul 2014 05:55:20 +0000 (-0700)
Subject: Merge tag '1.4' into fox
X-Git-Tag: fox1-v3-sn5~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=3cf030fffffd223c3717011e03aac82346295d71

Merge tag '1.4' into fox

tagging 1.4 release

Conflicts:
	src/Makefile
---

3cf030fffffd223c3717011e03aac82346295d71
diff --cc src/Makefile
index 1453720c,4e8b3c20..a9fe335e
--- a/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