From: Bdale Garbee Date: Thu, 19 Dec 2013 09:00:10 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos X-Git-Tag: 1.3^0 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=27528961457865acc3a38b822268df6d7cb86cfd;hp=4006effc538289c36a1563c1b717231991292c0c Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos --- diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 824ec9e1..71e96004 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -153,6 +153,7 @@ FIRMWARE_TMEGA_1_0=$(top_srcdir)/src/telemega-v1.0/telemega-v1.0-$(VERSION).ihx FIRMWARE_TMEGA=$(FIRMWARE_TMEGA_1_0) FIRMWARE_EMINI_1_0=$(top_srcdir)/src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx +FIRMWARE_EMINI=$(FIRMWARE_EMINI_1_0) FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI)