# Conflicts: # source/forms/CustomScpExplorer.cpp # source/forms/ScpCommander.cpp Source commit: 34e586b41ae07026a670b3741854c1a6e498d829