Marc-André Moreau 915b9a15b1 Merge branch 'master' of github.com:FreeRDP/FreeRDP ... Conflicts: winpr/libwinpr/bcrypt/CMakeLists.txt		2016-05-11 11:05:17 -04:00
..
client	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2016-05-11 11:05:17 -04:00
server	ConvertFromUnicode fixes and misc hardening	2016-03-03 16:56:19 +01:00
ChannelOptions.cmake	channels/rdpdr: start server-side device redirection	2013-08-18 18:09:12 -04:00
CMakeLists.txt	channels/rdpdr: start server-side device redirection	2013-08-18 18:09:12 -04:00