Skip to content
Commit 6ac0b548 authored by J-M's avatar J-M
Browse files

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
parents 54610f8a b755761b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment