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

..

include/rdtk

rdtk: fix windows build

2016-05-02 17:44:25 +02:00

librdtk

Merge branch 'master' of github.com:FreeRDP/FreeRDP

2016-05-11 11:05:17 -04:00

sample

…

CMakeLists.txt

…