Marc-André Moreau cff9c16c1e Merge branch 'master' of github.com:FreeRDP/FreeRDP ... Conflicts: channels/disp/client/disp_main.c		2014-08-11 10:36:07 -04:00
..
client	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2014-08-11 10:36:07 -04:00
ChannelOptions.cmake	channels/disp: initial RDP8.1 MS-RDPEDISP implementation	2013-07-08 18:36:03 -04:00
CMakeLists.txt	channels/disp: initial RDP8.1 MS-RDPEDISP implementation	2013-07-08 18:36:03 -04:00