From 16c4cae7ebed7bd3ee0f12b8872bf950574f17e8 Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Tue, 18 May 2010 00:26:00 -0600
Subject: update changelogs for Debian build

---
 ChangeLog | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 63cba5ad..04a8a96d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,65 @@
+commit bc89d962c87b50e5487628f8ca25e4443ac4823d
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue May 18 00:24:03 2010 -0600
+
+    merge the altusmetrum-themes package
+
+commit 0c6cf621dfd8339b8bc3915750a3147235f1331b
+Merge: 32e430b 563a9dc
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon May 17 23:59:43 2010 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit 32e430b8a5f93b312f6359b4d553bad92ed37b19
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon May 17 22:43:19 2010 -0600
+
+    merge in a derivative of Bob Finch's mere mortals guide as a getting started
+    chapter
+
+commit 563a9dcdfef42718370c49f16cc2271642b3e055
+Author: Keith Packard <keithp@keithp.com>
+Date:   Mon May 17 21:30:57 2010 -0700
+
+    Finish basic flight monitoring UI with voice using FreeTTS
+    
+    This captures telemetry data to log files and presents flight status
+    information in audio form using FreeTTS.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 69092ffd23ac1928d5c84413fd00c2423f313fc2
+Merge: 3c2211a cc002c0
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon May 17 20:10:46 2010 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit cc002c0a43a02845ba67d1a61828be382f307b2e
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun May 16 22:31:23 2010 -0700
+
+    Fix telemetrum.inf, tested by Adrian and Keithp
+
+commit 3c2211ad7877d622435bc9e8c9c0b01d62be6ff0
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu May 13 15:37:37 2010 -0600
+
+    typo fix from Bob
+
+commit f0433c83d76e90d78fb86a1f4a2f145f3c57fb25
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu May 13 01:27:39 2010 -0600
+
+    updates from Bob
+
+commit 0f05cf06e3f1ec510b11d993d9038211ac66c97b
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed May 12 19:54:04 2010 -0600
+
+    update changelogs for Debian build
+
 commit 6bd85138c1bfbc1d8b78dce1501870a65a64db36
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Wed May 12 19:53:40 2010 -0600
-- 
cgit v1.2.3


From bb46c9a1da5788a082e4483e576a5a6d3963507b Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Tue, 18 May 2010 00:26:28 -0600
Subject: update changelogs for Debian build

---
 ChangeLog        | 6 ++++++
 debian/changelog | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 04a8a96d..02813e47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+commit 16c4cae7ebed7bd3ee0f12b8872bf950574f17e8
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue May 18 00:26:00 2010 -0600
+
+    update changelogs for Debian build
+
 commit bc89d962c87b50e5487628f8ca25e4443ac4823d
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Tue May 18 00:24:03 2010 -0600
diff --git a/debian/changelog b/debian/changelog
index aadf50ca..23dca4a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-altos (0.6+213+gbc89d96) unstable; urgency=low
+altos (0.6+214+g16c4cae) unstable; urgency=low
 
   [ Bdale Garbee ]
   * updates including a typo fix from Bob Finch to the PKGBUILD-git.altos
-- 
cgit v1.2.3