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/System.Data.Odbc/OdbcConnection.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcConnection.cs
@@ -37,7 +37,7 @@ using System.Data.Common;
 using System.EnterpriseServices;
 using System.Runtime.InteropServices;
 using System.Text;
-#if NET_2_0 && !TARGET_JVM
+#if NET_2_0
 using System.Transactions;
 #endif