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

[fw/altos] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 2a3c8fdb2c2679e81a46e83c432189e61603e3b0..1c9e127a90d1db96e0506fd7a826c7da1a22d7ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+<<<<<<< HEAD
+commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue Mar 30 23:11:40 2010 -0600
+
+    initial harness for documentation
+
+commit 9801ff7de21027935f52ccabaa3ff157e22d21ce
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Mar 15 12:04:18 2010 -0600
+
+    move gbp.conf into debian/
+
+=======
+>>>>>>> df7bda1f32b0049c3878c325ea0b55999f3980e3
+commit eda5e1166a97766aa22561beaa1086ba4e19ee16
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Mar 4 17:33:39 2010 -0700
+
+    update changelogs for Debian build
+
 commit 6e61170d42936c18cd6efba6f4c14af616a30745
 Author: Keith Packard <keithp@keithp.com>
 Date:   Sun Feb 28 18:24:46 2010 -0800