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
..
2015-05-27 22:58:41 +03:00
2015-01-30 08:54:10 +01:00
2015-05-27 22:58:41 +03:00
2016-02-25 21:57:56 +01:00