Marc-André Moreau a7de9e5ac9 Merge branch 'master' of github.com:awakecoding/FreeRDP into sspi ... Conflicts: winpr/include/winpr/timezone.h winpr/libwinpr/timezone/timezone.c		2014-06-10 16:40:58 -04:00
..
winpr	Merge branch 'master' of github.com:awakecoding/FreeRDP into sspi	2014-06-10 16:40:58 -04:00
CMakeLists.txt	makecert: install header file	2014-05-07 21:09:34 +02:00