Merged everything into GMCS.

svn path=/trunk/mcs/; revision=35949

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 68ea4ddfadb1af77e66e9511d3db6e446bc3ca0c..257aa04d07c9f9f5651e3feae01ed0b12e9b87a0 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-10  Martin Baulig  <martin@ximian.com>
+
+       Merged latest changes into gmcs.  Please keep this comment in
+       here, it makes it easier for me to see what changed in MCS since
+       the last time I merged.
+
 2004-11-07  Miguel de Icaza  <miguel@ximian.com>
 
        * expression.cs (Invocation.OverloadResolve): Flag error if we are
@@ -464,12 +470,6 @@
        561 report.
        (PropertyBase.FindOutParentMethod): Add errors 545, 546 report.
 
-2004-10-18  Martin Baulig  <martin@ximian.com>
-
-       Merged latest changes into gmcs.  Please keep this comment in
-       here, it makes it easier for me to see what changed in MCS since
-       the last time I merged.
-
 2004-10-18  Martin Baulig  <martin@ximian.com>
 
        * statement.cs (Fixed.Resolve): Don't access the TypeExpr's