|
|
@@ -76,7 +76,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WatermarkTest", "Samples\Wa
|
|
|
EndProject
|
|
|
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AnnotationImportExportTest", "Samples\AnnotationImportExportTest\VB\AnnotationImportExportTest.vbproj", "{FFBD38E6-2CAE-4A9F-9E51-2A3CEFD82A0D}"
|
|
|
EndProject
|
|
|
-<<<<<<< Updated upstream
|
|
|
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TextSearchTest", "Samples\TextSearchTest\VB\TextSearchTest.vbproj", "{72F0E73F-C5E7-4059-AE51-D285221A79F6}"
|
|
|
EndProject
|
|
|
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TextExtractTest", "Samples\TextExtractTest\VB\TextExtractTest.vbproj", "{9E580A41-AD4F-4106-AA50-EFDB46DEA40A}"
|
|
|
@@ -114,7 +113,6 @@ EndProject
|
|
|
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BookmarkTest", "Samples\BookmarkTest\VB\BookmarkTest.vbproj", "{D922B3BB-3823-4506-BC8B-7C682B7F8AB9}"
|
|
|
EndProject
|
|
|
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DigitalSignatureTest", "Samples\DigitalSignatureTest\VB\DigitalSignatureTest.vbproj", "{84A958E6-C1DA-42C4-88E5-EBF4E3E632FE}"
|
|
|
->>>>>>> Stashed changes
|
|
|
EndProject
|
|
|
Global
|
|
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
|
@@ -496,7 +494,6 @@ Global
|
|
|
{FFBD38E6-2CAE-4A9F-9E51-2A3CEFD82A0D}.Release|x64.Build.0 = Release|Any CPU
|
|
|
{FFBD38E6-2CAE-4A9F-9E51-2A3CEFD82A0D}.Release|x86.ActiveCfg = Release|Any CPU
|
|
|
{FFBD38E6-2CAE-4A9F-9E51-2A3CEFD82A0D}.Release|x86.Build.0 = Release|Any CPU
|
|
|
-<<<<<<< Updated upstream
|
|
|
{72F0E73F-C5E7-4059-AE51-D285221A79F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
|
{72F0E73F-C5E7-4059-AE51-D285221A79F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
|
{72F0E73F-C5E7-4059-AE51-D285221A79F6}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
|
@@ -665,8 +662,6 @@ Global
|
|
|
{F22C3E06-1B62-4516-AFC8-11F9B706206D}.Release|x64.Build.0 = Release|Any CPU
|
|
|
{F22C3E06-1B62-4516-AFC8-11F9B706206D}.Release|x86.ActiveCfg = Release|Any CPU
|
|
|
{F22C3E06-1B62-4516-AFC8-11F9B706206D}.Release|x86.Build.0 = Release|Any CPU
|
|
|
-=======
|
|
|
->>>>>>> Stashed changes
|
|
|
{AAE10F2E-F7B0-4487-BEDE-274CE74CA55E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
|
{AAE10F2E-F7B0-4487-BEDE-274CE74CA55E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
|
{AAE10F2E-F7B0-4487-BEDE-274CE74CA55E}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
|
@@ -757,7 +752,6 @@ Global
|
|
|
{0B9A4542-3DFF-4862-973C-12308CBB2FAA} = {812D8275-2791-4CEF-A4E8-39A78E49D8FB}
|
|
|
{0A17E1EE-3912-491F-A9DB-E5F72B36938D} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
|
|
{FFBD38E6-2CAE-4A9F-9E51-2A3CEFD82A0D} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
|
|
-<<<<<<< Updated upstream
|
|
|
{72F0E73F-C5E7-4059-AE51-D285221A79F6} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
|
|
{9E580A41-AD4F-4106-AA50-EFDB46DEA40A} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
|
|
{6D1DE0A5-8E7D-403E-8470-F72BB06FD35A} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
|
|
@@ -772,8 +766,6 @@ Global
|
|
|
{36760764-DC79-4857-8500-9BD7CF77101E} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
|
|
{9E6E96F8-C900-4374-A7A3-93481F733379} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
|
|
{F22C3E06-1B62-4516-AFC8-11F9B706206D} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
|
|
-=======
|
|
|
->>>>>>> Stashed changes
|
|
|
{AAE10F2E-F7B0-4487-BEDE-274CE74CA55E} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
|
|
{481B43E1-2183-4B34-8994-FFF58EA3B108} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
|
|
{8FE5F6A4-92B5-4041-B659-50C032EBB965} = {0B9A4542-3DFF-4862-973C-12308CBB2FAA}
|
