Permalink
Browse files

Resolve conflicts

All "confilcts" were actually diffs - not sure why git flew off the
handle.
  • Loading branch information...
1 parent 2e69817 commit 2e462e04d5531ac0825e49050e743d5e155cd4d4 @aleks-f aleks-f committed Jan 12, 2013
Showing with 10 additions and 1,395 deletions.
  1. +0 −13 Crypto/CMakeLists.txt
  2. +2 −170 Crypto/Crypto_vs110.vcxproj
  3. +1 −150 Crypto/testsuite/TestSuite_vs110.vcxproj
  4. +0 −9 Data/MySQL/include/Poco/Data/MySQL/Connector.h
  5. +1 −6 Data/MySQL/testsuite/src/SQLExecutor.h
  6. +0 −42 Data/SQLite/src/SQLiteStatementImpl.cpp
  7. +0 −17 Foundation/CMakeLists.txt
  8. +0 −15 Foundation/Foundation_vs100.vcxproj
  9. +0 −34 Foundation/Foundation_vs110.sln
  10. +0 −15 Foundation/Foundation_vs110.vcxproj
  11. +0 −15 Foundation/Foundation_vs110.vcxproj.filters
  12. +0 −15 Foundation/Foundation_x64_vs110.vcxproj
  13. +0 −15 Foundation/Foundation_x64_vs110.vcxproj.filters
  14. +0 −4 Foundation/include/Poco/FIFOBufferStream.h
  15. +0 −173 Foundation/include/Poco/NumericString.h
  16. +1 −11 Foundation/include/Poco/StringTokenizer.h
  17. +0 −7 Foundation/include/Poco/UTFString.h
  18. +0 −6 Foundation/testsuite/TestSuite_vs110.vcxproj
  19. +0 −6 Foundation/testsuite/TestSuite_vs110.vcxproj.filters
  20. +0 −6 Foundation/testsuite/TestSuite_x64_vs110.vcxproj
  21. +0 −6 Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters
  22. +0 −3 Foundation/testsuite/src/VarTest.cpp
  23. +0 −8 JSON/CMakeLists.txt
  24. +0 −25 JSON/JSON_vs100.sln
  25. +0 −233 JSON/src/Parser.cpp
  26. +4 −35 JSON/testsuite/src/JSONTest.cpp
  27. +0 −9 JSON/testsuite/src/JSONTest.h
  28. +0 −9 Net/Net_vs110.vcxproj
  29. +0 −9 Net/Net_vs110.vcxproj.filters
  30. +0 −9 Net/Net_x64_vs110.vcxproj
  31. +0 −9 Net/Net_x64_vs110.vcxproj.filters
  32. +0 −3 Net/samples/SMTPLogger/Makefile
  33. +0 −8 NetSSL_OpenSSL/CMakeLists.txt
  34. +0 −12 PDF/CMakeLists.txt
  35. +0 −8 Util/CMakeLists.txt
  36. +1 −19 Util/include/Poco/Util/JSONConfiguration.h
  37. +0 −9 Util/samples/Units/src/Units.cpp
  38. +0 −227 Util/src/JSONConfiguration.cpp
  39. +0 −9 Util/testsuite/src/JSONConfigurationTest.cpp
  40. +0 −8 XML/CMakeLists.txt
  41. +0 −8 Zip/CMakeLists.txt
View
@@ -1,8 +1,4 @@
set(LIBNAME "PocoCrypto")
-<<<<<<< HEAD
-set(LIBNAME "${LIBNAME}${LIB_EXT}")
-=======
->>>>>>> develop
aux_source_directory(src SRCS)
add_definitions(-D_USRDLL -DCrypto_EXPORTS)
@@ -12,21 +8,12 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} )
#if(CMAKE_SYSTEM MATCHES "Windows")
-<<<<<<< HEAD
-# target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${LIB_EAY_RELEASE} ${OPENSSL_LIBRARIES} )
-#ELSE()
-# target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} )
-#ENDIF()
-
-target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${OPENSSL_LIBRARIES} )
-=======
# target_link_libraries( ${LIBNAME} PocoFoundation ${LIB_EAY_RELEASE} ${OPENSSL_LIBRARIES} )
#ELSE()
# target_link_libraries( ${LIBNAME} PocoFoundation ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} )
#ENDIF()
target_link_libraries( ${LIBNAME} PocoFoundation ${OPENSSL_LIBRARIES} )
->>>>>>> develop
install(
DIRECTORY include/Poco
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?>
-=======
-<?xml version="1.0" encoding="utf-8"?>
->>>>>>> develop
+<?xml version="1.0" encoding="utf-8"?>
+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="debug_shared|Win32">
@@ -36,109 +33,37 @@
<RootNamespace>Crypto</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
-<<<<<<< HEAD
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
- <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="Configuration">
-=======
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
->>>>>>> develop
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
-<<<<<<< HEAD
- <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="Configuration">
-=======
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
->>>>>>> develop
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
-<<<<<<< HEAD
- <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="Configuration">
-=======
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
->>>>>>> develop
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
-<<<<<<< HEAD
- <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="Configuration">
-=======
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
->>>>>>> develop
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
-<<<<<<< HEAD
- <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="Configuration">
-=======
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
->>>>>>> develop
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
-<<<<<<< HEAD
- <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="Configuration">
-=======
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
->>>>>>> develop
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
-<<<<<<< HEAD
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
- <ImportGroup Label="ExtensionSettings"/>
- <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="PropertySheets">
- <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
- </ImportGroup>
- <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="PropertySheets">
- <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
- </ImportGroup>
- <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="PropertySheets">
- <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
- </ImportGroup>
- <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="PropertySheets">
- <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
- </ImportGroup>
- <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="PropertySheets">
- <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
- </ImportGroup>
- <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="PropertySheets">
- <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
- </ImportGroup>
- <PropertyGroup Label="UserMacros"/>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">..\bin\</OutDir>
- <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
- <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">true</LinkIncremental>
- <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">..\bin\</OutDir>
- <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
- <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">false</LinkIncremental>
- <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">..\lib\</OutDir>
- <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
- <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">..\lib\</OutDir>
- <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
- <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">..\lib\</OutDir>
- <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
- <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">..\lib\</OutDir>
- <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
- <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">PocoCryptod</TargetName>
- <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">PocoCryptomdd</TargetName>
- <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">PocoCryptomtd</TargetName>
- <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">PocoCrypto</TargetName>
- <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">PocoCryptomd</TargetName>
- <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">PocoCryptomt</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">
-=======
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
@@ -213,7 +138,6 @@
<LibraryPath>C:\OpenSSL\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
->>>>>>> develop
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -226,11 +150,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
- <PrecompiledHeader/>
-=======
<PrecompiledHeader />
->>>>>>> develop
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
@@ -248,11 +168,7 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
-<<<<<<< HEAD
- <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">
-=======
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
->>>>>>> develop
<ClCompile>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -267,15 +183,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
- <PrecompiledHeader/>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat/>
-=======
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat />
->>>>>>> develop
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
@@ -292,11 +202,7 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
-<<<<<<< HEAD
- <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">
-=======
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
->>>>>>> develop
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -309,11 +215,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
- <PrecompiledHeader/>
-=======
<PrecompiledHeader />
->>>>>>> develop
<ProgramDataBaseFileName>..\lib\PocoCryptomtd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -324,11 +226,7 @@
<OutputFile>..\lib\PocoCryptomtd.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
-<<<<<<< HEAD
- <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">
-=======
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
->>>>>>> develop
<ClCompile>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -343,27 +241,17 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
- <PrecompiledHeader/>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat/>
-=======
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat />
->>>>>>> develop
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
<OutputFile>..\lib\PocoCryptomt.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
-<<<<<<< HEAD
- <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">
-=======
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
->>>>>>> develop
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -376,11 +264,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
- <PrecompiledHeader/>
-=======
<PrecompiledHeader />
->>>>>>> develop
<ProgramDataBaseFileName>..\lib\PocoCryptomdd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -391,11 +275,7 @@
<OutputFile>..\lib\PocoCryptomdd.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
-<<<<<<< HEAD
- <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">
-=======
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
->>>>>>> develop
<ClCompile>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -410,17 +290,10 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
- <PrecompiledHeader/>
- <ProgramDataBaseFileName>..\lib\PocoCryptomd.pdb</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat/>
-=======
<PrecompiledHeader />
<ProgramDataBaseFileName>..\lib\PocoCryptomd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat />
->>>>>>> develop
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
@@ -430,46 +303,6 @@
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
-<<<<<<< HEAD
- <ClInclude Include="include\Poco\Crypto\Cipher.h"/>
- <ClInclude Include="include\Poco\Crypto\CipherFactory.h"/>
- <ClInclude Include="include\Poco\Crypto\CipherImpl.h"/>
- <ClInclude Include="include\Poco\Crypto\CipherKey.h"/>
- <ClInclude Include="include\Poco\Crypto\CipherKeyImpl.h"/>
- <ClInclude Include="include\Poco\Crypto\CryptoStream.h"/>
- <ClInclude Include="include\Poco\Crypto\CryptoTransform.h"/>
- <ClInclude Include="include\Poco\Crypto\RSACipherImpl.h"/>
- <ClInclude Include="include\Poco\Crypto\RSADigestEngine.h"/>
- <ClInclude Include="include\Poco\Crypto\RSAKey.h"/>
- <ClInclude Include="include\Poco\Crypto\RSAKeyImpl.h"/>
- <ClInclude Include="include\Poco\Crypto\X509Certificate.h"/>
- <ClInclude Include="include\Poco\Crypto\Crypto.h"/>
- <ClInclude Include="include\Poco\Crypto\OpenSSLInitializer.h"/>
- <ClInclude Include="include\Poco\Crypto\DigestEngine.h"/>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\Cipher.cpp"/>
- <ClCompile Include="src\CipherFactory.cpp"/>
- <ClCompile Include="src\CipherImpl.cpp"/>
- <ClCompile Include="src\CipherKey.cpp"/>
- <ClCompile Include="src\CipherKeyImpl.cpp"/>
- <ClCompile Include="src\CryptoStream.cpp"/>
- <ClCompile Include="src\CryptoTransform.cpp"/>
- <ClCompile Include="src\RSACipherImpl.cpp"/>
- <ClCompile Include="src\RSADigestEngine.cpp"/>
- <ClCompile Include="src\RSAKey.cpp"/>
- <ClCompile Include="src\RSAKeyImpl.cpp"/>
- <ClCompile Include="src\X509Certificate.cpp"/>
- <ClCompile Include="src\OpenSSLInitializer.cpp"/>
- <ClCompile Include="src\DigestEngine.cpp"/>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\DLLVersion.rc"/>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
- <ImportGroup Label="ExtensionTargets"/>
-</Project>
-=======
<ClInclude Include="include\Poco\Crypto\Cipher.h" />
<ClInclude Include="include\Poco\Crypto\CipherFactory.h" />
<ClInclude Include="include\Poco\Crypto\CipherImpl.h" />
@@ -508,4 +341,3 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
->>>>>>> develop
Oops, something went wrong. Retry.

0 comments on commit 2e462e0

Please sign in to comment.