Unity API

Code review comment for lp:~unity-team/unity-api/add-surfacemanager-and-item

  1. add-surfacemanager-and-item
  2. Merge into qtMirCompositor
Revision history for this message
Michał Sawicz (saviq) wrote :

Text conflict in test/qmltest/mocks/plugins/Unity/Application/CMakeLists.txt
Text conflict in test/qmltest/unity/shell/CMakeLists.txt
2 conflicts encountered.

Reply

« Back to merge proposal