Merge branch 'prototyping' into feature/dotnetcore
# Conflicts: # R.NET/RDotNet.csproj # RDotNet.FSharp.Tests/RDotNet.FSharp.Tests.fsproj # RDotNet.FSharp/RDotNet.FSharp.fsproj # RDotNet.Graphics.Tests/RDotNet.Graphics.Tests.csproj # RDotNet.NativeLibrary/RDotNet.NativeLibrary.csproj # RDotNet.TestBase/RDotNet.TestBase.csproj # RDotNet.Tests/RDotNet.Tests.csproj # TestApps/SimpleTest/SimpleTest.csproj # TestApps/StressTest/StressTest.csproj
Loading
Please sign in to comment