Merge lp://staging/~phablet-team/ubuntu-system-settings/printing-fix-conflicts into lp://staging/ubuntu-system-settings

Proposed by Andrew Hayzen
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 1780
Merged at revision: 1769
Proposed branch: lp://staging/~phablet-team/ubuntu-system-settings/printing-fix-conflicts
Merge into: lp://staging/ubuntu-system-settings
Diff against target: 1715 lines (+1561/-1)
21 files modified
debian/control (+1/-0)
plugins/CMakeLists.txt (+1/-0)
plugins/brightness/brightness.settings (+1/-1)
plugins/mouse/mouse.settings (+1/-0)
plugins/printing/AddPrinter.qml (+144/-0)
plugins/printing/AddPrinterDetails.qml (+316/-0)
plugins/printing/CMakeLists.txt (+29/-0)
plugins/printing/PageComponent.qml (+206/-0)
plugins/printing/Printer.qml (+141/-0)
plugins/printing/PrinterConnection.qml (+71/-0)
plugins/printing/Setting.qml (+63/-0)
plugins/printing/TextBoxListItem.qml (+59/-0)
plugins/printing/printer-sub-pages/CopiesAndPages.qml (+51/-0)
plugins/printing/printer-sub-pages/GeneralSettings.qml (+84/-0)
plugins/printing/printer-sub-pages/Policies.qml (+77/-0)
plugins/printing/printer-sub-pages/Status.qml (+92/-0)
plugins/printing/printing.settings (+25/-0)
plugins/printing/printing.svg (+188/-0)
src/main.cpp (+3/-0)
src/qml/MainWindow.qml (+6/-0)
src/url-map.ini (+2/-0)
To merge this branch: bzr merge lp://staging/~phablet-team/ubuntu-system-settings/printing-fix-conflicts
Reviewer Review Type Date Requested Status
Andrew Hayzen (community) Approve
Review via email: mp+320912@code.staging.launchpad.net

Commit message

Jonas Drange: adds printing panel

Description of the change

Jonas Drange: adds printing panel

To post a comment you must log in.
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Previous approval was here, https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/printers/+merge/315339. This simply resolves conflicts so we can build again.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches