# Conflicts: # source/windows/WinConfiguration.cpp Source commit: c060de075d101750ba7f93ed1b671183f5d4b1a4