<table><tr><td style="">davidedmundson updated this revision to Diff 37879.<br />davidedmundson added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D12388">View Revision</a></tr></table><br /><div><div><p>Rebase and fix conflicts</p></div></div><br /><div><strong>REPOSITORY</strong><div><div>R127 KWayland</div></div></div><br /><div><strong>CHANGES SINCE LAST UPDATE</strong><div><a href="https://phabricator.kde.org/D12388?vs=34770&id=37879">https://phabricator.kde.org/D12388?vs=34770&id=37879</a></div></div><br /><div><strong>BRANCH</strong><div><div>master</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D12388">https://phabricator.kde.org/D12388</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>autotests/client/test_wayland_outputdevice.cpp<br />
autotests/client/test_wayland_outputmanagement.cpp<br />
src/client/outputconfiguration.cpp<br />
src/client/outputconfiguration.h<br />
src/client/outputdevice.cpp<br />
src/client/outputdevice.h<br />
src/client/protocols/output-management.xml<br />
src/client/protocols/outputdevice.xml<br />
src/server/outputchangeset.cpp<br />
src/server/outputchangeset.h<br />
src/server/outputchangeset_p.h<br />
src/server/outputconfiguration_interface.cpp<br />
src/server/outputdevice_interface.cpp<br />
src/server/outputdevice_interface.h</div></div></div><br /><div><strong>To: </strong>davidedmundson, Frameworks, graesslin, romangg<br /><strong>Cc: </strong>kde-frameworks-devel, graesslin, davidedmundson, zzag, cfeck, michaelh, ngraham, bruns<br /></div>