# Conflicts: # source/packages/my/OperationWithTimeout.pas # source/windows/WinConfiguration.cpp Source commit: b32101fcd6b246de1cf6853aa135fee665e0a3de
Martin Prikryl