Unity 8

Code review comment for lp:~paulliu/unity8/noninteractive20140804

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

Text conflict in tests/plugins/Dash/cardcreator/1.res
Text conflict in tests/plugins/Dash/cardcreator/2.res
Text conflict in tests/plugins/Dash/cardcreator/3.res
Text conflict in tests/plugins/Dash/cardcreator/4.res
Text conflict in tests/plugins/Dash/cardcreator/5.res
Text conflict in tests/plugins/Dash/cardcreator/6.res
Text conflict in tests/plugins/Dash/cardcreator/7.res
Text conflict in tests/qmltests/Dash/tst_GenericScopeView.qml
8 conflicts encountered.

review: Needs Fixing

« Back to merge proposal