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
..
CMakeLists.txt	cmake: mark required libraries for export	2014-04-23 10:16:02 +02:00
ModuleOptions.cmake	libwinpr: add module definition files	2012-09-21 13:02:54 -04:00
timezone.c	Merge branch 'master' of github.com:awakecoding/FreeRDP into sspi	2014-06-10 16:40:58 -04:00