aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fcec2e6fbc..c2d945554a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-10 Ettore Perazzoli <ettore@ximian.com>
+
+ * NEWS: Added info about the shell, plus some minor fixes for
+ consistency.
+
2001-10-10 Christopher James Lahey <clahey@ximian.com>
* NEWS (Addressbook): Updated.
@@ -56,7 +61,6 @@
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