X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ChangeLog;h=1c9e127a90d1db96e0506fd7a826c7da1a22d7ce;hp=6a6fc7e3b0ef57ecda14a69155a0f2d9aa6ddd6c;hb=b41e617080fe825f7810ee5eee52ea37f7618ec6;hpb=e4e17e6d3844ae682a0e7a9469a522359bac77b6

diff --git a/ChangeLog b/ChangeLog
index 6a6fc7e3..1c9e127a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+<<<<<<< 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
+
+    Need to duplicate new altitude conversion code in aoview.
+    
+    Altitude conversion is now done with a smaller table and interpolation
+    instead of a giant table.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e4e17e6d3844ae682a0e7a9469a522359bac77b6
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sat Feb 27 17:36:13 2010 -0700
+
+    update changelogs for Debian build
+
 commit a1478f65538fdaac7b58ffbd958a035b74956099
 Merge: 901fce5 bbf8c9f
 Author: Keith Packard <keithp@keithp.com>