Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
--- a/mcs/class/System/System.Net/FileWebResponse.cs
+++ b/mcs/class/System/System.Net/FileWebResponse.cs
@ -145,11 +145,7 @@ namespace System.Net
 			((IDisposable) this).Dispose ();
 		}

-#if TARGET_JVM //enable overrides for extenders
-		public override void Dispose()
-#else
 		void IDisposable.Dispose()
-#endif
 		{
 			Dispose (true);