# Conflicts: # source/forms/CustomScpExplorer.cpp Source commit: 22b26ed29430994a63fef2e1fa611db90ac9367b
Martin Prikryl