Unity 8

Code review comment for lp:~lukas-kde/unity8/newWindowDecosAndPanel

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

Text conflict in qml/Components/WindowControlButtons.qml
Text conflict in qml/Panel/Panel.qml
Text conflict in qml/Stages/DecoratedWindow.qml
Text conflict in qml/Stages/DesktopStage.qml
Text conflict in tests/qmltests/Stages/tst_DesktopStage.qml
5 conflicts encountered.

« Back to merge proposal