Author: lewing
Date: 2007-11-08 16:07:44 -0500 (Thu, 08 Nov 2007)
New Revision: 89256

Modified:
   trunk/moon/ChangeLog
Log:
Fix changelog


Modified: trunk/moon/ChangeLog
===================================================================
--- trunk/moon/ChangeLog        2007-11-08 21:07:44 UTC (rev 89255)
+++ trunk/moon/ChangeLog        2007-11-08 21:07:44 UTC (rev 89256)
@@ -1,16 +1,7 @@
-<<<<<<< HEAD:ChangeLog
 2007-11-08  Stephane Delcroix  <[EMAIL PROTECTED]>
-=======
-2007-11-08  Larry Ewing  <[EMAIL PROTECTED]>
->>>>>>> 2007-11-08 Larry Ewing <[EMAIL PROTECTED]>:ChangeLog
 
-<<<<<<< HEAD:ChangeLog
        * configure.ac:  check for gtk-sharp-2.0 and rsvg-sharp-2.0 required
        for tools/svg2xaml. Fixes bnc #325316.
-=======
-       * src/shape.cpp: always clip to the width/height regardless of the
-       fill type.  Verified against tests.
->>>>>>> 2007-11-08 Larry Ewing <[EMAIL PROTECTED]>:ChangeLog
 
 2007-11-06  Larry Ewing  <[EMAIL PROTECTED]>
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to