Marc-André Moreau 3c5b8b3d57 Merge branch 'dvc_streampool' of github.com:akallabeth/FreeRDP into egfx ... Conflicts: channels/rdpgfx/client/rdpgfx_main.c include/freerdp/dvc.h		2014-06-11 13:13:03 -04:00
..
client	Merge branch 'dvc_streampool' of github.com:akallabeth/FreeRDP into egfx	2014-06-11 13:13:03 -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