Imported Upstream version 4.0.3.13

Former-commit-id: 4f1f69b42e04def9a697c2550b23b9cae645ef29
2015-07-20 03:39:00 -04:00
parent 4cee7df5e0
commit 2c051c3d51
138 changed files with 3829 additions and 206 deletions
--- a/mcs/class/System.ServiceModel/Dummy_2_1.cs
+++ b/mcs/class/System.ServiceModel/Dummy_2_1.cs
@@ -1,3 +1,4 @@
+#if !XAMMAC_4_5
 using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.Serialization;
@@ -187,3 +188,4 @@ namespace Mono.Xml.XPath
 	class Dummy {}
 }
 #endif
+#endif