Merge from HEAD.

[mono.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 6c6791c55400bb0164998b125c2bf8f7ecbdbfa2..f151e6aa336484418157963d7eecfcc66b554ede 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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.