Unity 8

Code review comment for lp:~mzanetti/unity8/update-inputinfo

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

Note: was already top approved

Conflict: can't delete qml/Components/UnityInputInfo because it is not empty. Not deleting.
Conflict because qml/Components/UnityInputInfo is not versioned, but has versioned children. Versioned directory.
Contents conflict in qml/Components/UnityInputInfo/UnityInputInfo.qml
Text conflict in qml/OrientedShell.qml
Text conflict in tests/qmltests/Notifications/tst_Notifications.qml
Text conflict in tests/qmltests/Notifications/tst_SwipeToAct.qml
6 conflicts encountered.

review: Needs Fixing

« Back to merge proposal