42c83c25f8
Conflicts: channels/tsmf/client/tsmf_main.c |
||
---|---|---|
.. | ||
include | ||
libwinpr | ||
tools | ||
.gitignore | ||
CMakeLists.txt | ||
WinPRConfig.cmake.in |
42c83c25f8
Conflicts: channels/tsmf/client/tsmf_main.c |
||
---|---|---|
.. | ||
include | ||
libwinpr | ||
tools | ||
.gitignore | ||
CMakeLists.txt | ||
WinPRConfig.cmake.in |