Unity 8

Code review comment for lp://staging/~macslow/unity8/replace-combo-button-fix-1384730

  1. replace-combo-button-fix-1384730
  2. Merge into trunk
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in tests/qmltests/CMakeLists.txt
Text conflict in tests/qmltests/Notifications/tst_Notifications.qml
2 conflicts encountered.

« Back to merge proposal