davidedmundson updated this revision to Diff 37879. davidedmundson added a comment.
Rebase and fix conflicts REPOSITORY R127 KWayland CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D12388?vs=34770&id=37879 BRANCH master REVISION DETAIL https://phabricator.kde.org/D12388 AFFECTED FILES autotests/client/test_wayland_outputdevice.cpp autotests/client/test_wayland_outputmanagement.cpp src/client/outputconfiguration.cpp src/client/outputconfiguration.h src/client/outputdevice.cpp src/client/outputdevice.h src/client/protocols/output-management.xml src/client/protocols/outputdevice.xml src/server/outputchangeset.cpp src/server/outputchangeset.h src/server/outputchangeset_p.h src/server/outputconfiguration_interface.cpp src/server/outputdevice_interface.cpp src/server/outputdevice_interface.h To: davidedmundson, #frameworks, graesslin, romangg Cc: kde-frameworks-devel, graesslin, davidedmundson, zzag, cfeck, michaelh, ngraham, bruns