2010-04-09 Atsushi Enomoto <atsushi@ximian.com>

* TypeExtension.cs, TypeExtensionMethods.cs : renamed to avoid confusion between Sys.Win.Markup.TypeExtension. * System.Xaml.dll.sources : renamed TypeExtension.cs. svn path=/trunk/mcs/; revision=155130
mono · Apr 9, 2010 · 5239124 · 5239124
1 parent 6d9958e
commit 5239124
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/mcs/class/System.Xaml/ChangeLog b/mcs/class/System.Xaml/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-09  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* System.Xaml.dll.sources : renamed TypeExtension.cs.
+
 2010-04-09  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* System.Xaml_test.dll.sources : add XamlLanguageTest.cs.

diff --git a/mcs/class/System.Xaml/System.Xaml.dll.sources b/mcs/class/System.Xaml/System.Xaml.dll.sources
@@ -75,7 +75,7 @@ System.Xaml/IXamlNamespaceResolver.cs
 System.Xaml/IXamlObjectWriterFactory.cs
 System.Xaml/IXamlSchemaContextProvider.cs
 System.Xaml/NamespaceDeclaration.cs
-System.Xaml/TypeExtension.cs
+System.Xaml/TypeExtensionMethods.cs
 System.Xaml/XamlBackgroundReader.cs
 System.Xaml/XamlDeferringLoader.cs
 System.Xaml/XamlDirective.cs

diff --git a/mcs/class/System.Xaml/System.Xaml/ChangeLog b/mcs/class/System.Xaml/System.Xaml/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-09  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* TypeExtension.cs, TypeExtensionMethods.cs : renamed to avoid
+	  confusion between Sys.Win.Markup.TypeExtension.
+
 2010-04-09  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* TypeExtension.cs

diff --git a/.../System.Xaml/System.Xaml/TypeExtension.cs → ....Xaml/System.Xaml/TypeExtensionMethods.cs b/.../System.Xaml/System.Xaml/TypeExtension.cs → ....Xaml/System.Xaml/TypeExtensionMethods.cs