X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ChangeLog;h=b65681ad1797b52f122ccb2c04a267738e6e49fc;hb=refs%2Ftags%2Fdebian%2F0.6%2B193%2Bg314d27a;hp=00e3e44951d303e840215e8686c5cff30075c411;hpb=01cefa181b04e53c20109ef8f3ffff633744da73;p=fw%2Faltos

diff --git a/ChangeLog b/ChangeLog
index 00e3e449..b65681ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,66 @@
+commit 314d27a73c903fef2968dabac3d5313573713460
+Merge: fa77db2 823fc0a
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu May 6 12:47:30 2010 -0600
+
+    Merge remote branch 'remotes/origin/fix-reset'
+
+commit 823fc0ac27b8df9b4ba1ca0f229b431baf5b46dd
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed May 5 12:50:39 2010 -0700
+
+    Don't change dbg clock while changing reset_n. Use 20ms everywhere
+    
+    This changes the reset code to be more conservative about changing
+    things at the same time, and also sets all timings to 20ms to make
+    debugging with the scope easier.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit fa77db2ffd8a749c93767db5a6311131e00473ae
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed May 5 02:34:41 2010 -0600
+
+    update changelogs for Debian build
+
+commit 8b6767e24a88482dbd3d4c4c969a0be08917d22b
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed May 5 01:32:46 2010 -0700
+
+    Use ao_delay to sleep for 2 seconds instead of trying ao_sleep
+    
+    ao_sleep doesn't delay for a specified time interval as much as one
+    might want it to.
+
+commit e6bb80975fde20928a830170f0821d59a8c72690
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed May 5 01:31:57 2010 -0700
+
+    Fix all stdio reading functions to be __critical
+    
+    Oh, right SDCC has '__critical' to mark sections of code that need to
+    run with interrupts disabled; no need to use EA = 0 and EA = 1.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ff03cdf746b83542ebcca00d32e6cc69ccfc122d
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed May 5 01:57:54 2010 -0600
+
+    update changelogs for Debian build
+
+commit 8702f497c4278648303eced1aed5bd76d559521a
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed May 5 01:57:11 2010 -0600
+
+    initial attempt at a telemetrum turn on script .. needs work
+
+commit 01cefa181b04e53c20109ef8f3ffff633744da73
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed May 5 01:56:51 2010 -0600
+
+    update changelogs for Debian build
+
 commit 45a1c2d2dfb69e5269ef2756fcd0f734b48d41cb
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Wed May 5 01:54:33 2010 -0600