- Updated

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 99042ed19111563d081eecb234591ad02aecf428..fa2e5b7acc9547c21fefb26ad956e4a4db9a3511 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-09  Peter Bartok  <pbartok@novell.com>
+
+       * Application.cs: Undid changes from r37004 which cause problems 
+       on X11
+
 2004-12-09  Ravindra  <rkumar@novell.com>
 
        * ToolBar.cs: Added support for displaying ContextMenu
@@ -22,6 +27,7 @@
        Add window resizing/positioning.
        Fix visibility on reparenting.
 
+>>>>>>> .r37496
 2004-12-08  Peter Bartok  <pbartok@novell.com>
 
        * XplatUIOSX.cs: Added Idle event, now compiles on VS.Net