Author: kostat
Date: 2005-12-08 05:12:42 -0500 (Thu, 08 Dec 2005)
New Revision: 54106

Modified:
   branches/mainsoft/gh1.7/mcs/class/System.XML/System.Xml/ChangeLog
   
branches/mainsoft/gh1.7/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs
Log:
merge -r 54103:54104

Modified: branches/mainsoft/gh1.7/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- branches/mainsoft/gh1.7/mcs/class/System.XML/System.Xml/ChangeLog   
2005-12-08 09:48:38 UTC (rev 54105)
+++ branches/mainsoft/gh1.7/mcs/class/System.XML/System.Xml/ChangeLog   
2005-12-08 10:12:42 UTC (rev 54106)
@@ -1,3 +1,8 @@
+2005-12-08  Andrew Skiba  <[EMAIL PROTECTED]>
+
+       * IXmlNamespaceResolver.cs: delete TARGET_JVM,
+       no need to mangle the name
+
 2005-11-30  Konstantin Triger  <[EMAIL PROTECTED]>
 
        * IXmlNamespaceResolver.cs: TARGET_JVM namespace change.

Modified: 
branches/mainsoft/gh1.7/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs
===================================================================
--- 
branches/mainsoft/gh1.7/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs
    2005-12-08 09:48:38 UTC (rev 54105)
+++ 
branches/mainsoft/gh1.7/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs
    2005-12-08 10:12:42 UTC (rev 54106)
@@ -38,9 +38,6 @@
 #if NET_2_0
        public interface IXmlNamespaceResolver
 #else
-#if TARGET_JVM
-       [vmw.common.ChangeInterfaceMethodNames]
-#endif
        internal interface IXmlNamespaceResolver
 #endif
        {

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

Reply via email to