poco/NetSSL_OpenSSL
Alex 2e462e04d5 Resolve conflicts
All "confilcts" were actually diffs - not sure why git flew off the
handle.
2013-01-12 14:27:50 -06:00
..
doc new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
include/Poco/Net GH #26: Cannot compile on gcc 2012-12-12 23:02:20 -06:00
samples unbundled build fixes 2013-01-05 00:04:09 -06:00
src - Poco::Net::HTTPSSessionInstantiator::registerInstantiator() now optionally accepts a Poco::Net::Context object. 2012-11-10 11:48:35 +01:00
testsuite fixed text files 2012-11-11 13:56:24 +01:00
CMakeLists.txt Resolve conflicts 2013-01-12 14:27:50 -06:00
dependencies new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
Makefile change EOL to 'native' 2012-04-29 18:52:25 +00:00
NetSSL_OpenSSL_CE_vs90.sln new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
NetSSL_OpenSSL_CE_vs90.vcproj new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
NetSSL_OpenSSL_vs71.sln change EOL to 'native' 2012-04-29 18:52:25 +00:00
NetSSL_OpenSSL_vs71.vcproj change EOL to 'native' 2012-04-29 18:52:25 +00:00
NetSSL_OpenSSL_vs80.sln change EOL to 'native' 2012-04-29 18:52:25 +00:00
NetSSL_OpenSSL_vs80.vcproj change EOL to 'native' 2012-04-29 18:52:25 +00:00
NetSSL_OpenSSL_vs90.sln change EOL to 'native' 2012-04-29 18:52:25 +00:00
NetSSL_OpenSSL_vs90.vcproj change EOL to 'native' 2012-04-29 18:52:25 +00:00
NetSSL_OpenSSL_vs100.sln new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
NetSSL_OpenSSL_vs100.vcxproj Windows/VS2011 build all configs 2012-09-23 06:28:42 +00:00
NetSSL_OpenSSL_vs100.vcxproj.filters new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
NetSSL_OpenSSL_vs110.sln fixed text files 2012-11-11 13:56:24 +01:00
NetSSL_OpenSSL_vs110.vcxproj fixed text files 2012-11-11 13:56:24 +01:00
NetSSL_OpenSSL_vs110.vcxproj.filters fixed text files 2012-11-11 13:56:24 +01:00
NetSSL_OpenSSL_x64_vs90.sln new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
NetSSL_OpenSSL_x64_vs90.vcproj new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
NetSSL_OpenSSL_x64_vs100.sln new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
NetSSL_OpenSSL_x64_vs100.vcxproj new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
NetSSL_OpenSSL_x64_vs100.vcxproj.filters new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00
NetSSL_OpenSSL_x64_vs110.sln fixed text files 2012-11-11 13:56:24 +01:00
NetSSL_OpenSSL_x64_vs110.vcxproj fixed text files 2012-11-11 13:56:24 +01:00
NetSSL_OpenSSL_x64_vs110.vcxproj.filters fixed text files 2012-11-11 13:56:24 +01:00
NetSSL_OpenSSL.progen new trunk (base for 1.5) 2012-04-23 01:14:34 +00:00