# Conflicts: # source/windows/GUITools.cpp # source/windows/GUITools.h Source commit: 40505a4b8e1f257ee268ec1b920beea91cd76ea8