Conflicts: src/lib/arch/win32/ArchPluginWindows.cpp
Conflicts: src/gui/gui.pro src/gui/src/PluginManager.cpp src/lib/arch/win32/ArchPluginWindows.cpp