Unity 8

Code review comment for lp:~dandrader/unity8/childWindows

  1. childWindows
  2. Merge into trunk
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in debian/control
Text conflict in qml/Shell.qml
Text conflict in qml/Stage/Stage.qml
Text conflict in tests/mocks/Unity/Application/plugin.cpp
Text conflict in tests/qmltests/Stage/tst_DesktopStage.qml
Text conflict in tests/qmltests/tst_Shell.qml
6 conflicts encountered.

« Back to merge proposal