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
..
freerdp	Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow	2014-08-11 19:22:33 -04:00
CMakeLists.txt	install version.h	2013-11-06 17:44:17 +01:00