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
..
freerdp	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2014-08-11 10:36:07 -04:00
CMakeLists.txt	install version.h	2013-11-06 17:44:17 +01:00