Unity 8

Code review comment for lp:~nick-dedekind/unity8/expanded-panel-design

  1. expanded-panel-design
  2. Merge into trunk
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in qml/Shell.qml
Text conflict in tests/qmltests/CMakeLists.txt
Text conflict in tests/qmltests/tst_ShellWithPin.qml
3 conflicts encountered.

« Back to merge proposal