Unity 8

Code review comment for lp:~unity-team/unity8/flickables-speed-workaround

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

Text conflict in debian/control
Text conflict in plugins/Dash/CardCreator.js
Text conflict in qml/Dash/GenericScopeView.qml
Text conflict in qml/Dash/ScopeSettingsPage.qml
Text conflict in qml/Panel/Indicators/DefaultIndicatorPage.qml
Text conflict in qml/Panel/MenuContent.qml
Text conflict in tests/plugins/Dash/cardcreator/2.res
Text conflict in tests/plugins/Dash/cardcreator/7.res
Text conflict in tests/qmltests/Dash/tst_GenericScopeView.qml
9 conflicts encountered.

review: Needs Fixing

« Back to merge proposal