projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge pull request #409 from Alkarex/patch-1
[mono.git]
/
mcs
/
class
/
System.Core
/
System.Linq
/
ParallelMergeOptions.cs
diff --git
a/mcs/class/System.Core/System.Linq/ParallelMergeOptions.cs
b/mcs/class/System.Core/System.Linq/ParallelMergeOptions.cs
index 0adea44bc85d470fd1b4b88869cf92b0797a0792..6073516aa698a3dbcf5476dde52ef5324d3d2989 100644
(file)
--- a/
mcs/class/System.Core/System.Linq/ParallelMergeOptions.cs
+++ b/
mcs/class/System.Core/System.Linq/ParallelMergeOptions.cs
@@
-1,4
+1,3
@@
-#if NET_4_0
//
// ParallelMergeOptions.cs
//
@@
-25,6
+24,7
@@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
+#if NET_4_0 || MOBILE
using System;
namespace System.Linq