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
..
2016-05-02 16:10:31 +02:00
2014-10-01 12:18:17 -04:00
2014-10-01 12:18:17 -04:00
2016-03-29 20:34:52 -04:00
2015-03-25 17:38:20 +01:00
2014-11-17 00:55:25 +01:00
2015-03-03 19:36:54 +01:00