Unity 8

Code review comment for lp:~mzanetti/unity8/ubuntuanimations

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

Note: was top approved already

Text conflict in qml/Panel/Panel.qml
Text conflict in qml/Stages/DesktopStage.qml
Text conflict in qml/Stages/WindowResizeArea.qml
Text conflict in tests/qmltests/Stages/tst_DesktopStage.qml
Text conflict in tests/qmltests/Stages/tst_WindowResizeArea.qml
Text conflict in tests/qmltests/tst_Shell.qml
6 conflicts encountered.

Maybe these conflicts are from the parent branch totally but better to remerge all the chain

review: Needs Fixing

« Back to merge proposal