diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-12-19 02:04:43 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-12-19 02:04:43 -0700 |
| commit | e572092092f06b7bde762ad24cceea32271bfbd2 (patch) | |
| tree | f2523fca6f7c974357f16d114beb3098d9e93c1b | |
| parent | cf05119040c45bfd1a0f63fcaae5dcf7a2556639 (diff) | |
| parent | 27528961457865acc3a38b822268df6d7cb86cfd (diff) | |
Merge branch 'branch-1.3' into debian
Conflicts:
src/test/Makefile
| -rw-r--r-- | altosui/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
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) |