* Uri.cs: 2.1 Uris do get a UriTypeConverter.

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

diff --git a/mcs/class/System/System/ChangeLog b/mcs/class/System/System/ChangeLog
index d331b9899d715d47b16d40db1fb294eaf0b3c69b..88301e44b0d66ab50e30f6f97bdb211c688e8870 100644 (file)
--- a/mcs/class/System/System/ChangeLog
+++ b/mcs/class/System/System/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-10  Jackson Harper  <jackson@ximian.com>
+
+       * Uri.cs: 2.1 Uris do get a UriTypeConverter.
+
 2009-02-18  Atsushi Enomoto  <atsushi@ximian.com>
 
        * Uri.cs : file URI for Windows path should also try '\' instead of

diff --git a/mcs/class/System/System/Uri.cs b/mcs/class/System/System/Uri.cs
index 5bbd6141caa6d5b14afe4d6b0d3caec51b7b6c75..20a94b4f80338e3456e213f952f7272b19d71931 100644 (file)
--- a/mcs/class/System/System/Uri.cs
+++ b/mcs/class/System/System/Uri.cs
@@ -55,9 +55,7 @@ namespace System {
 
        [Serializable]
 #if NET_2_0
-#if !NET_2_1
        [TypeConverter (typeof (UriTypeConverter))]
-#endif
        public class Uri : ISerializable {
 #else
        public class Uri : MarshalByRefObject, ISerializable {