Skip to content

Commit ebf0af7

Browse files
committed
Merge branch 'master' into dev
2 parents cddf22f + 59af091 commit ebf0af7

File tree

4 files changed

+0
-112
lines changed

4 files changed

+0
-112
lines changed

OpenCL.NetCore.sln

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCL.NetCore.Tests", "Ope
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCL.NetCore", "OpenCL.NetCore\OpenCL.NetCore.csproj", "{46714EC3-385B-4BD7-9818-2BD3DB0A31E6}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples", "Samples\Samples.csproj", "{BEC38063-3CDC-4076-AE2A-374529EB8AE2}"
11-
EndProject
1210
Global
1311
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1412
Debug|Any CPU = Debug|Any CPU
@@ -63,26 +61,6 @@ Global
6361
{46714EC3-385B-4BD7-9818-2BD3DB0A31E6}.Release|x64.Build.0 = Release|Any CPU
6462
{46714EC3-385B-4BD7-9818-2BD3DB0A31E6}.Release|x86.ActiveCfg = Release|Any CPU
6563
{46714EC3-385B-4BD7-9818-2BD3DB0A31E6}.Release|x86.Build.0 = Release|Any CPU
66-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
68-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|ARM.ActiveCfg = Debug|Any CPU
69-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|ARM.Build.0 = Debug|Any CPU
70-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
71-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|ARM64.Build.0 = Debug|Any CPU
72-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|x64.ActiveCfg = Debug|Any CPU
73-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|x64.Build.0 = Debug|Any CPU
74-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|x86.ActiveCfg = Debug|Any CPU
75-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Debug|x86.Build.0 = Debug|Any CPU
76-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
77-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|Any CPU.Build.0 = Release|Any CPU
78-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|ARM.ActiveCfg = Release|Any CPU
79-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|ARM.Build.0 = Release|Any CPU
80-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|ARM64.ActiveCfg = Release|Any CPU
81-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|ARM64.Build.0 = Release|Any CPU
82-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|x64.ActiveCfg = Release|Any CPU
83-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|x64.Build.0 = Release|Any CPU
84-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|x86.ActiveCfg = Release|Any CPU
85-
{BEC38063-3CDC-4076-AE2A-374529EB8AE2}.Release|x86.Build.0 = Release|Any CPU
8664
EndGlobalSection
8765
GlobalSection(SolutionProperties) = preSolution
8866
HideSolutionNode = FALSE

Samples/Kernel.cl

Lines changed: 0 additions & 5 deletions
This file was deleted.

Samples/Program.cs

Lines changed: 0 additions & 73 deletions
This file was deleted.

Samples/Samples.csproj

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)