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	cleanup cmake exports and pkg-config files	2016-01-12 17:32:33 +01:00
ChannelOptions.cmake	channels: cmake cleanup, USB redirection refactoring	2012-11-20 19:34:52 -05:00
CMakeLists.txt	channels: refactoring of channels cmake scripts with macros	2012-10-17 02:14:19 -04:00