Author: kostat
Date: 2005-12-04 05:06:29 -0500 (Sun, 04 Dec 2005)
New Revision: 53898
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Drawing/ChangeLog
branches/mainsoft/gh1.7/mcs/class/System.Drawing/net_1_1_java_System.Drawing.dll.exclude.sources
branches/mainsoft/gh1.7/mcs/class/System.Drawing/net_1_1_java_System.Drawing.dll.sources
Log:
merge -r 53896:53897
Modified: branches/mainsoft/gh1.7/mcs/class/System.Drawing/ChangeLog
===================================================================
--- branches/mainsoft/gh1.7/mcs/class/System.Drawing/ChangeLog 2005-12-04
10:05:12 UTC (rev 53897)
+++ branches/mainsoft/gh1.7/mcs/class/System.Drawing/ChangeLog 2005-12-04
10:06:29 UTC (rev 53898)
@@ -1,3 +1,9 @@
+2005-12-04 Konstantin Triger <[EMAIL PROTECTED]>
+
+ * net_1_1_java_System.Drawing.dll.exclude.sources,
+ net_1_1_java_System.Drawing.dll.sources:
+ correcting SystemIcons.cs reference.
+
2005-11-28 Konstantin Triger <[EMAIL PROTECTED]>
* System.Drawing.vmwcsproj: Added System icons; changed to mono icon
implementation.
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Drawing/net_1_1_java_System.Drawing.dll.exclude.sources
===================================================================
---
branches/mainsoft/gh1.7/mcs/class/System.Drawing/net_1_1_java_System.Drawing.dll.exclude.sources
2005-12-04 10:05:12 UTC (rev 53897)
+++
branches/mainsoft/gh1.7/mcs/class/System.Drawing/net_1_1_java_System.Drawing.dll.exclude.sources
2005-12-04 10:06:29 UTC (rev 53898)
@@ -28,6 +28,7 @@
System.Drawing/SolidBrush.cs
System.Drawing/StringFormat.cs
System.Drawing/SystemColors.cs
+System.Drawing/SystemIcons.cs
System.Drawing/TextureBrush.cs
##completely different files
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Drawing/net_1_1_java_System.Drawing.dll.sources
===================================================================
---
branches/mainsoft/gh1.7/mcs/class/System.Drawing/net_1_1_java_System.Drawing.dll.sources
2005-12-04 10:05:12 UTC (rev 53897)
+++
branches/mainsoft/gh1.7/mcs/class/System.Drawing/net_1_1_java_System.Drawing.dll.sources
2005-12-04 10:06:29 UTC (rev 53898)
@@ -30,6 +30,7 @@
System.Drawing/SolidBrush.jvm.cs
System.Drawing/StringFormat.jvm.cs
System.Drawing/SystemColors.jvm.cs
+System.Drawing/SystemIcons.jvm.cs
System.Drawing/TextureBrush.jvm.cs
##completely different files
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches