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
..
freerdp	Merge branch 'dvc_streampool' of github.com:akallabeth/FreeRDP into egfx	2014-06-11 13:13:03 -04:00
CMakeLists.txt	install version.h	2013-11-06 17:44:17 +01:00