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-11-09 15:54:22 +01:00
2016-03-29 18:14:34 +02:00
2016-04-07 15:10:00 +02:00
2016-03-14 13:19:08 +01:00
2016-02-29 15:18:19 +01:00
2016-03-29 20:34:52 -04:00
2016-03-14 13:19:08 +01:00
2016-02-29 15:18:19 +01:00
2016-03-14 13:19:08 +01:00
2016-02-29 15:18:19 +01:00
2016-04-15 14:32:40 +02:00
2016-03-29 18:14:34 +02:00