Ubuntu Settings Components

Code review comment for lp:~larsu/ubuntu-settings-components/remove-icon-lookup-hack

  1. remove-icon-lookup-hack
  2. Merge into trunk
Revision history for this message
Michał Sawicz (saviq) wrote :

Text conflict in examples/SettingsComponents.qml
Contents conflict in plugins/Ubuntu/Settings/Components/StatusIcon.qml
Text conflict in plugins/Ubuntu/Settings/Components/qmldir
Text conflict in tests/qmltests/CMakeLists.txt
Contents conflict in tests/qmltests/Components/tst_StatusIcon.qml
5 conflicts encountered.

Reply

« Back to merge proposal