Merge from HEAD.

[mono.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index bf710d6e16cc47a1f3dd92a914b60ca5c92fe5a7..f151e6aa336484418157963d7eecfcc66b554ede 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-14  Joe Shaw  <joeshaw@novell.com>
+ 
+        * man/mono.1: Fix the syntax of the M: trace syntax
+
+2004-10-10  Zoltan Varga  <vargaz@freemail.hu>
+
+       * configure.in: Add some checks for cygwin weirdness.
+
 2004-09-04 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * configure.in: added check for kqueue. Patch from Geoff Norton