Merge branch 'dev'
[cuda.git] / cuda.sln
index 05ee571..6ca5315 100644 (file)
--- a/cuda.sln
+++ b/cuda.sln
@@ -15,6 +15,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binarize", "binarize\binari
                {4C5C7860-D42E-4598-9742-D5AD444DB16F} = {4C5C7860-D42E-4598-9742-D5AD444DB16F}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mult_matrices", "mult_matrices\mult_matrices.vcxproj", "{C53873B0-FFDB-4F95-8FB5-3C782DEE6FE2}"
+       ProjectSection(ProjectDependencies) = postProject
+               {4C5C7860-D42E-4598-9742-D5AD444DB16F} = {4C5C7860-D42E-4598-9742-D5AD444DB16F}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -37,6 +42,10 @@ Global
                {09509FB4-D960-4D0A-95CA-B581FF768B61}.Debug|Win32.Build.0 = Debug|Win32
                {09509FB4-D960-4D0A-95CA-B581FF768B61}.Release|Win32.ActiveCfg = Release|Win32
                {09509FB4-D960-4D0A-95CA-B581FF768B61}.Release|Win32.Build.0 = Release|Win32
+               {C53873B0-FFDB-4F95-8FB5-3C782DEE6FE2}.Debug|Win32.ActiveCfg = Debug|Win32
+               {C53873B0-FFDB-4F95-8FB5-3C782DEE6FE2}.Debug|Win32.Build.0 = Debug|Win32
+               {C53873B0-FFDB-4F95-8FB5-3C782DEE6FE2}.Release|Win32.ActiveCfg = Release|Win32
+               {C53873B0-FFDB-4F95-8FB5-3C782DEE6FE2}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE