From: Keith Packard <keithp@keithp.com>
Date: Tue, 25 Dec 2012 22:20:42 +0000 (-0800)
Subject: Merge branch 'master' into micropeak-logging
X-Git-Tag: 1.1.9.3~8^2~9^2~45
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=868ef0c9c4b208c02a87180b0eede329369bdc77;hp=-c

Merge branch 'master' into micropeak-logging
---

868ef0c9c4b208c02a87180b0eede329369bdc77
diff --combined configure.ac
index e3b1185f,0fcd97e2..55dd20ec
--- a/configure.ac
+++ b/configure.ac
@@@ -149,8 -149,7 +149,8 @@@ altoslib/Makefil
  altosui/Makefile
  altosui/AltosVersion.java
  altosui/Info.plist
 -altosui/libaltos/Makefile
 +libaltos/Makefile
 +micropeak/Makefile
  altosdroid/Makefile
  altosdroid/local.properties
  ao-tools/Makefile
@@@ -164,6 -163,7 +164,7 @@@ ao-tools/ao-load/Makefil
  ao-tools/ao-telem/Makefile
  ao-tools/ao-stmload/Makefile
  ao-tools/ao-send-telem/Makefile
+ ao-tools/ao-sky-flash/Makefile
  ao-utils/Makefile
  src/Version
  ])