summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2010-05-06 13:59:23 -0600
committerBdale Garbee <bdale@gag.com>2010-05-06 13:59:23 -0600
commit53b9a9bc28a9278249ff37f92110c21380e93cda (patch)
treed2e28765b3e6363110ccba0a33f43bddacb6809d /ChangeLog
parentcde60f16f6ab2cdd5010a0e106ae312d144947cf (diff)
update changelogs for Debian builddebian/0.6+195+gcde60f1
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog17
1 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b65681ad..42b8155d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+commit cde60f16f6ab2cdd5010a0e106ae312d144947cf
+Author: Bdale Garbee <bdale@gag.com>
+Date: Thu May 6 13:58:31 2010 -0600
+
+ Revert "Merge remote branch 'remotes/origin/fix-reset'"
+
+ This reverts commit 314d27a73c903fef2968dabac3d5313573713460, reversing
+ changes made to fa77db2ffd8a749c93767db5a6311131e00473ae.
+
+ For whatever reason, this is utterly not doing the right things today!
+
+commit 8be04df7e1e0a369ffb1137c6e2ec63585e3c935
+Author: Bdale Garbee <bdale@gag.com>
+Date: Thu May 6 12:48:00 2010 -0600
+
+ update changelogs for Debian build
+
commit 314d27a73c903fef2968dabac3d5313573713460
Merge: fa77db2 823fc0a
Author: Bdale Garbee <bdale@gag.com>