Marc-André Moreau e4a4aa4d3a Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow ...

Conflicts:
	channels/encomsp/client/encomsp_main.c
	libfreerdp/core/tcp.c
	libfreerdp/crypto/certificate.c
	server/Windows/CMakeLists.txt
	server/X11/xf_cursor.c
	server/X11/xf_input.c
	server/X11/xf_interface.c
	server/X11/xf_monitors.c
	server/X11/xf_peer.c

2014-08-11 19:22:33 -04:00

..

test

Reverted previous replacements, not to be done for tests.

2014-08-07 19:05:22 +02:00

base64.c

Changes for base64

2014-05-11 22:49:10 +02:00

ber.c

Replaced custom logging mechanism with WLog wrapper.

2014-08-07 16:51:24 +02:00

certificate.c

Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow

2014-08-11 19:22:33 -04:00

CMakeLists.txt

Added WITH_LIBRARY_VERSIONING, allowing to build shared libraries without

2014-07-11 11:53:58 +02:00

crypto.c

Replaced custom logging mechanism with WLog wrapper.

2014-08-07 16:51:24 +02:00

der.c

…

er.c

…

per.c

…

tls.c

Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow

2014-08-11 19:22:33 -04:00