diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-06 13:41:36 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-06 13:41:36 -0600 | 
| commit | 8c212cd5bfa03f71a31d84bd0051314e77d88461 (patch) | |
| tree | 5be036b3510b8b474ad829caea20fcbc75b56839 /configure.ac | |
| parent | e9714e34091abe657aa1b30aeda9466331aa39c1 (diff) | |
| parent | dd26ec2e706bdd29090759deeb90090a0e3b74f0 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
	ao-bringup/turnon_telemega
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 38bab8e1..683da846 100644 --- a/configure.ac +++ b/configure.ac @@ -537,6 +537,7 @@ ao-tools/ao-flash/Makefile  ao-tools/ao-test-igniter/Makefile  ao-tools/ao-test-baro/Makefile  ao-tools/ao-test-flash/Makefile +ao-tools/ao-cal-accel/Makefile  ao-utils/Makefile  src/Version  ])  | 
