# Conflicts: # src/citra_qt/bootmanager.cpp # src/citra_qt/configuration/configure_motion_touch.ui # src/citra_qt/main.cpp # src/common/settings.cpp # src/core/CMakeLists.txt # src/core/core.h