Christian Plattner ff42e9f12c Merge commit 'dd6d82': Switch to OpenSSL BIOs ... Conflicts: libfreerdp/core/tcp.c libfreerdp/core/transport.c		2015-01-20 00:47:16 +01:00
..
freerdp	Merge commit 'dd6d82': Switch to OpenSSL BIOs	2015-01-20 00:47:16 +01:00
CMakeLists.txt	install version.h	2013-11-06 17:44:17 +01:00