← Back to branch summary

~dobey/ubuntu-printing-app/add-notifier-daemon

~dobey/ubuntu-printing-app/add-notifier-daemon

Viewing all changes in revision 43.

Committer: Rodney Dawes
Date: 2017-03-17 17:55:52 UTC
mfrom: (23.2.3 ubuntu-printing-app)
Revision ID: rodney.dawes@canonical.com-20170317175552-267wu0f58hf7mzbz

Merge trunk.

files added:
.bzr-builddeb

.bzr-builddeb/default.conf

setup/gui/ubuntu-printing-app.desktop

setup/gui/ubuntu-printing-app.svg

ubuntu-printing-app/components/AlertDialog.qml

ubuntu-printing-app/components/BaseRowLayout.qml

ubuntu-printing-app/pages/EmptyPage.qml

ubuntu-printing-app/ubuntu-printing-app.svg

files removed:
backend/tests

backend/tests/unit

backend/tests/unit/tst_mytype.qml

manifest.json.in

tests/qmltests/tst_QmlTests.cpp

ubuntu-printing-app/components/AlertDialog.qml

ubuntu-printing-app/ubuntu-printing-app.png

files renamed:
backend/Ubuntu_Printing_App/ => backend/UbuntuPrintingApp/

files modified:
CMakeLists.txt

backend/CMakeLists.txt

backend/UbuntuPrintingApp/backend.cpp

backend/UbuntuPrintingApp/backend.h

backend/UbuntuPrintingApp/document.cpp

backend/UbuntuPrintingApp/pagehelper.h

backend/UbuntuPrintingApp/qmldir

debian/changelog

debian/control

debian/copyright

debian/rules

po/ubuntu-printing-app.pot

runner/ubuntu-printing-app.in

snapcraft.yaml

tests/qmltests/CMakeLists.txt

tests/qmltests/tst_PreviewRow.qml

tests/qmltests/tst_PrintPage.qml

tests/qmltests/tst_PrintRow.qml

tests/qmltests/tst_SelectorRow.qml

tests/unittests/backend/CMakeLists.txt

tests/unittests/backend/tst_document.cpp

tests/unittests/backend/tst_pagehelper.cpp

tests/unittests/backend/tst_popplerimageprovider.cpp

ubuntu-printing-app/Main.qml

ubuntu-printing-app/components/CMakeLists.txt

ubuntu-printing-app/components/CheckBoxRow.qml

ubuntu-printing-app/components/LabelRow.qml

ubuntu-printing-app/components/PreviewRow.qml

ubuntu-printing-app/components/PrintRow.qml

ubuntu-printing-app/components/PrintingHelper.qml

ubuntu-printing-app/components/SelectorRow.qml

ubuntu-printing-app/components/TextFieldRow.qml

ubuntu-printing-app/pages/CMakeLists.txt

ubuntu-printing-app/pages/ContentPeerPickerPage.qml

ubuntu-printing-app/pages/PrintPage.qml

ubuntu-printing-app/ubuntu-printing-app-content-hub.json

ubuntu-printing-app/ubuntu-printing-app.desktop.in.in

Show diffs side-by-side

added added

removed removed

.bzr-builddeb/default.conf

backend/CMakeLists.txt

backend/UbuntuPrintingApp/backend.cpp

backend/UbuntuPrintingApp/backend.h

backend/UbuntuPrintingApp/document.cpp

backend/UbuntuPrintingApp/pagehelper.h

backend/UbuntuPrintingApp/qmldir

backend/tests/unit/

backend/tests/unit/tst_mytype.qml

debian/changelog

debian/copyright

manifest.json.in

po/ubuntu-printing-app.pot

runner/ubuntu-printing-app.in

setup/gui/ubuntu-printing-app.desktop

setup/gui/ubuntu-printing-app.svg

tests/qmltests/CMakeLists.txt

tests/qmltests/tst_PreviewRow.qml

tests/qmltests/tst_PrintPage.qml

tests/qmltests/tst_PrintRow.qml

tests/qmltests/tst_QmlTests.cpp

tests/qmltests/tst_SelectorRow.qml

tests/unittests/backend/CMakeLists.txt

tests/unittests/backend/tst_document.cpp

tests/unittests/backend/tst_pagehelper.cpp

tests/unittests/backend/tst_popplerimageprovider.cpp

ubuntu-printing-app/Main.qml

ubuntu-printing-app/components/AlertDialog.qml

ubuntu-printing-app/components/AlertDialog.qml

ubuntu-printing-app/components/BaseRowLayout.qml

ubuntu-printing-app/components/CMakeLists.txt

ubuntu-printing-app/components/CheckBoxRow.qml

ubuntu-printing-app/components/LabelRow.qml

ubuntu-printing-app/components/PreviewRow.qml

ubuntu-printing-app/components/PrintRow.qml

ubuntu-printing-app/components/PrintingHelper.qml

ubuntu-printing-app/components/SelectorRow.qml

ubuntu-printing-app/components/TextFieldRow.qml

ubuntu-printing-app/pages/CMakeLists.txt

ubuntu-printing-app/pages/ContentPeerPickerPage.qml

ubuntu-printing-app/pages/EmptyPage.qml

ubuntu-printing-app/pages/PrintPage.qml

ubuntu-printing-app/ubuntu-printing-app-content-hub.json

ubuntu-printing-app/ubuntu-printing-app.desktop.in.in

ubuntu-printing-app/ubuntu-printing-app.png

ubuntu-printing-app/ubuntu-printing-app.svg

Older »