Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@FracturedCode
FracturedCode committed Dec 18, 2020
2 parents cddf22f + 59af091 commit ebf0af7
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 112 deletions.
22 changes: 0 additions & 22 deletions OpenCL.NetCore.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCL.NetCore.Tests", "Ope
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCL.NetCore", "OpenCL.NetCore\OpenCL.NetCore.csproj", "{46714EC3-385B-4BD7-9818-2BD3DB0A31E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples", "Samples\Samples.csproj", "{BEC38063-3CDC-4076-AE2A-374529EB8AE2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -63,26 +61,6 @@ Global
{46714EC3-385B-4BD7-9818-2BD3DB0A31E6}.Release|x64.Build.0 = Release|Any CPU
{46714EC3-385B-4BD7-9818-2BD3DB0A31E6}.Release|x86.ActiveCfg = Release|Any CPU
{46714EC3-385B-4BD7-9818-2BD3DB0A31E6}.Release|x86.Build.0 = Release|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|ARM.ActiveCfg = Debug|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|ARM.Build.0 = Debug|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|ARM64.Build.0 = Debug|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|x64.ActiveCfg = Debug|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|x64.Build.0 = Debug|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|x86.ActiveCfg = Debug|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|x86.Build.0 = Debug|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|Any CPU.Build.0 = Release|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|ARM.ActiveCfg = Release|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|ARM.Build.0 = Release|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|ARM64.ActiveCfg = Release|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|ARM64.Build.0 = Release|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|x64.ActiveCfg = Release|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|x64.Build.0 = Release|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|x86.ActiveCfg = Release|Any CPU
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
5 changes: 0 additions & 5 deletions Samples/Kernel.cl
View file

This file was deleted.

73 changes: 0 additions & 73 deletions Samples/Program.cs
View file

This file was deleted.

12 changes: 0 additions & 12 deletions Samples/Samples.csproj
View file

This file was deleted.

0 comments on commit ebf0af7

Please sign in to comment.