diff options
| author | Keith Packard <keithp@keithp.com> | 2013-04-22 17:20:51 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-04-22 17:20:51 -0500 |
| commit | 33c3b2c57d0d4285b75d4dcf7ca67ad19da08c86 (patch) | |
| tree | a9ff47afab29fe141dcd1da0ca276b367f911cb6 /configure.ac | |
| parent | 1a84db819a359be39be51c9105039ab28c9fc894 (diff) | |
| parent | 90b0db1ae53182c94bf12d661446fc369d916366 (diff) | |
Merge branch 'master' into stm-flash
Conflicts:
ao-tools/ao-stmload/ao-stmload.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 977678f3..f54a8b4c 100644 --- a/configure.ac +++ b/configure.ac @@ -223,6 +223,7 @@ ao-tools/ao-send-telem/Makefile ao-tools/ao-sky-flash/Makefile ao-tools/ao-dumpflash/Makefile ao-tools/ao-edit-telem/Makefile +ao-tools/ao-dump-up/Makefile ao-utils/Makefile src/Version ]) |