Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

diff --git a/ChangeLog b/ChangeLog
index 024d44940b9f68ee42aafcabd882d0400eb4a44b..2a95a1ef5187370cbfeb3dfee1ed9a8bdda5b301 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+commit 99316a17a9642a207c45610e7cc1c33c2600ece0
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue Aug 23 21:33:53 2011 -0600
+
+    rewind changelog to 0.9.6.0 for rebuild
+
+commit 192881b7cae49af375cc2b8b7305c937079ee724
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue Aug 23 20:11:01 2011 -0600
+
+    update changelogs for Debian build
+
 commit fc7e46b1215ea2b4cc138ed77d8eaa122369b15f
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Tue Aug 23 20:10:14 2011 -0600

diff --git a/debian/changelog b/debian/changelog
index 670732e669aed455106a0e3ba3fb9adf93acdb50..6bec4012b9c0296c7d19633be2dfefdacc474963 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-altos (0.9.6.0+32+gfc7e46b) unstable; urgency=low
+altos (0.9.7.0) unstable; urgency=low
 
   [ Keith Packard ]
   * altos: Lost change that reported flight 0 when log memory was full
@@ -32,7 +32,7 @@ altos (0.9.6.0+32+gfc7e46b) unstable; urgency=low
   [ Bdale Garbee ]
   * turn off auto-tagging during Debian build
 
- -- Bdale Garbee <bdale@gag.com>  Tue, 23 Aug 2011 20:10:38 -0600
+ -- Bdale Garbee <bdale@gag.com>  Tue, 23 Aug 2011 21:36:50 -0600
 
 altos (0.9.6.0) unstable; urgency=low