aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 101ae5a204..f1acb1d591 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-01 Aaron Weber <aaron@ximian.com>
+
+ * help/C/Makefile.am: removed an extraneous tab.
+
2001-10-01 Ettore Perazzoli <ettore@ximian.com>
* configure.in: 0.15.99.
@@ -16,6 +20,7 @@
the order in Mozilla (it is suggested that they be in this order).
(nss_libs): Same.
+>>>>>>> 1.945
2001-09-27 Dan Winship <danw@ximian.com>
* configure.in: Remove references to the "compose" program, since