X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Fchangelog;h=a0790bf664a16c7074e1711b912cd0289080b6a2;hb=1b8671bd0a00cec6ae4ccf442cd007b18af82fb0;hp=0650c9d40c013c10739c27b49d01d1771d61ecc7;hpb=01cefa181b04e53c20109ef8f3ffff633744da73;p=fw%2Faltos

diff --git a/debian/changelog b/debian/changelog
index 0650c9d4..a0790bf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,29 @@
-altos (0.6+185+g45a1c2d) unstable; urgency=low
+altos (0.6+195+gcde60f1) unstable; urgency=low
+
+  * Revert "Merge remote branch 'remotes/origin/fix-reset'"
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 06 May 2010 13:59:16 -0600
+
+altos (0.6+193+g314d27a) unstable; urgency=low
+
+  [ Keith Packard ]
+  * Don't change dbg clock while changing reset_n. Use 20ms everywhere
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 06 May 2010 12:47:51 -0600
+
+altos (0.6+190+g8b6767e) unstable; urgency=low
+
+  [ Keith Packard ]
+  * Fix all stdio reading functions to be __critical
+  * Use ao_delay to sleep for 2 seconds instead of trying ao_sleep
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 05 May 2010 02:34:06 -0600
+
+altos (0.6+187+g8702f49) unstable; urgency=low
 
   [ Bdale Garbee ]
   * more text created during SFO->DEN flight
+  * initial attempt at a telemetrum turn on script .. needs work
 
   [ Keith Packard ]
   * Revert "Add optional 's' command to packet slave to enable/disable