Merge remote branch 'origin/master'

2 files changed, 30 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a6fc7e3..ea64f192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+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>
diff --git a/debian/changelog b/debian/changelog
index 5201fe7d..90b79f26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+altos (0.6+108+g6e61170) unstable; urgency=low
+
+  [ Keith Packard ]
+  * Need to duplicate new altitude conversion code in aoview.
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 04 Mar 2010 17:33:27 -0700
+
 altos (0.6+106+ga1478f6) unstable; urgency=low
 
   [ Keith Packard ]