# Conflicts: # source/forms/CustomScpExplorer.h Source commit: da8149b7a0fc2a4fe79fb808f414754d3d40333c
Martin Prikryl