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-04-08 11:34:37 +02:00
2015-06-22 19:10:00 +02:00
2015-04-14 13:47:23 +02:00
2015-05-11 09:07:39 +02:00
2015-04-08 11:34:37 +02:00