a7de9e5ac9
Conflicts: winpr/include/winpr/timezone.h winpr/libwinpr/timezone/timezone.c |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
ModuleOptions.cmake | ||
timezone.c |
a7de9e5ac9
Conflicts: winpr/include/winpr/timezone.h winpr/libwinpr/timezone/timezone.c |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
ModuleOptions.cmake | ||
timezone.c |