Unity 8

Code review comment for lp:~nick-dedekind/unity8/side-stage-redesign

  1. side-stage-redesign
  2. Merge into trunk
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in plugins/Utils/CMakeLists.txt
Text conflict in plugins/Utils/plugin.cpp
Text conflict in qml/Shell.qml
Text conflict in qml/Stages/AbstractStage.qml
Text conflict in qml/Stages/TabletStage.qml
Text conflict in tests/mocks/Utils/CMakeLists.txt
Text conflict in tests/mocks/Utils/plugin.cpp
7 conflicts encountered.

« Back to merge proposal