diff --git a/ChangeLog b/ChangeLog
index 7e9de9e0c..00bd34546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 20 19:39:21 2000  Nicola Pero  <n.pero@mi.flashnet.it>
+
+	* Source/NSText.m, Source/NSTextView.m: Most code from NSText was
+	merged into NSTextView.
+	* Source/NSText.h, Source/NSTextView.h: Moved many ivars from
+	NSText to NSTextView.
+	
 Wed Dec 20 15:23:22 2000  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* Source/NSText.m ([-setDelegate:]): Simplified.