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.Data.Linq/src/DbLinq/Schema/Dbml/DatabaseSerializer.cs
+++ b/mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/DatabaseSerializer.cs
@@ -2144,7 +2144,6 @@ namespace DbLinq.Schema.Dbml
 		}
 	}

-	#if !TARGET_JVM
 	#if !MONO_STRICT
    public
    #endif
@@ -2218,6 +2217,5 @@ namespace DbLinq.Schema.Dbml
 		}
 	}

-	#endif
 }