mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e4a4aa4d3a
FreeRDP/channels/encomsp
History
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
..
client Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow 2014-08-11 19:22:33 -04:00
server Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow 2014-07-17 17:33:33 -04:00
ChannelOptions.cmake encomsp: stub client/server virtual channel 2014-06-23 16:18:03 -04:00
CMakeLists.txt encomsp: stub client/server virtual channel 2014-06-23 16:18:03 -04:00