Merge branch 'master' into micropeak-logging
[fw/altos] / configure.ac
index ad10ac3cadfcdd386c144c19ce54fcc982874151..55dd20ec5cbd9ceb2c6b9925d809b4820336faf5 100644 (file)
@@ -149,7 +149,8 @@ altoslib/Makefile
 altosui/Makefile
 altosui/AltosVersion.java
 altosui/Info.plist
-altosui/libaltos/Makefile
+libaltos/Makefile
+micropeak/Makefile
 altosdroid/Makefile
 altosdroid/local.properties
 ao-tools/Makefile
@@ -164,7 +165,6 @@ ao-tools/ao-telem/Makefile
 ao-tools/ao-stmload/Makefile
 ao-tools/ao-send-telem/Makefile
 ao-tools/ao-sky-flash/Makefile
-ao-tools/ao-mega/Makefile
 ao-utils/Makefile
 src/Version
 ])