X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ChangeLog;h=e78fef87f552f751ebd49992b311271d3d8e9309;hp=59ada26224d8729678fa74093ee4447912f89f53;hb=773c4ffbc1d2e02eb02cfa543a077a408986da30;hpb=45ede4a4b203ef9da5bf05c49cb9c5a2e6382ec5

diff --git a/ChangeLog b/ChangeLog
index 59ada262..e78fef87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+commit 45ede4a4b203ef9da5bf05c49cb9c5a2e6382ec5
+Merge: 45e2938 e35e485
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sun Sep 6 14:05:51 2009 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit e35e485ffe6b26034788ab295121bc2693b7eec1
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Sep 6 13:04:31 2009 -0700
+
+    Initialize summary_name and detail_name so stuff appears on stdout.
+    
+    Uninitialized variables lead to mysterious results.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 45e2938121411d1fc9b3aec3fdeaaeb3c90db5ed
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sun Sep 6 14:02:14 2009 -0600
+
+    update changelogs for Debian build
+
 commit d42ebf0661ecf15455e5051de1e16ae66f8dd857
 Merge: 384dbe9 7a19aac
 Author: Bdale Garbee <bdale@gag.com>