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

ChannelOptions.cmake

Android: Added SDCard redirection support

2013-04-25 07:30:33 -07:00

CMakeLists.txt

…