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
..
CMakeLists.txt	winpr: always build "monolitic"	2014-07-10 11:10:58 +02:00
disp_main.c	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2014-08-11 10:36:07 -04:00
disp_main.h	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2014-08-11 10:36:07 -04:00