Merge lp:~mzanetti/reminders-app/align-imports into lp:reminders-app
Proposed by
Michael Zanetti
Status: | Merged |
---|---|
Approved by: | Riccardo Padovani |
Approved revision: | 491 |
Merged at revision: | 491 |
Proposed branch: | lp:~mzanetti/reminders-app/align-imports |
Merge into: | lp:reminders-app |
Diff against target: |
533 lines (+76/-76) 33 files modified
src/app/qml/components/BouncingProgressBar.qml (+1/-1) src/app/qml/components/ConflictDelegate.qml (+1/-1) src/app/qml/components/EditTagsDialog.qml (+3/-3) src/app/qml/components/ListItemWithActions.qml (+2/-2) src/app/qml/components/ListItemWithActionsCheckBox.qml (+1/-1) src/app/qml/components/NoteHeader.qml (+3/-3) src/app/qml/components/NotebooksDelegate.qml (+3/-3) src/app/qml/components/NotesDelegate.qml (+3/-3) src/app/qml/components/PageWithBottomEdge.qml (+1/-1) src/app/qml/components/PulldownListView.qml (+1/-1) src/app/qml/components/RemindersDelegate.qml (+5/-5) src/app/qml/components/ResolveConflictConfirmationDialog.qml (+2/-2) src/app/qml/components/RtfButton.qml (+1/-1) src/app/qml/components/RtfSeparator.qml (+2/-2) src/app/qml/components/SortingDialog.qml (+3/-3) src/app/qml/components/StatusBar.qml (+1/-1) src/app/qml/components/TagsDelegate.qml (+3/-3) src/app/qml/components/ToolbarSpacer.qml (+2/-2) src/app/qml/reminders.qml (+3/-3) src/app/qml/ui/AccountSelectorPage.qml (+2/-2) src/app/qml/ui/EditNotePage.qml (+2/-2) src/app/qml/ui/EditNoteView.qml (+4/-4) src/app/qml/ui/NoteConflictPage.qml (+1/-1) src/app/qml/ui/NoteConflictView.qml (+2/-2) src/app/qml/ui/NotePage.qml (+1/-1) src/app/qml/ui/NoteView.qml (+3/-3) src/app/qml/ui/NotebooksPage.qml (+3/-3) src/app/qml/ui/NotesPage.qml (+4/-4) src/app/qml/ui/RemindersPage.qml (+3/-3) src/app/qml/ui/SearchNotesPage.qml (+3/-3) src/app/qml/ui/SetReminderPage.qml (+1/-1) src/app/qml/ui/SetReminderView.qml (+3/-3) src/app/qml/ui/TagsPage.qml (+3/-3) |
To merge this branch: | bzr merge lp:~mzanetti/reminders-app/align-imports |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Riccardo Padovani | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email: mp+271139@code.launchpad.net |
Commit message
align all sdk imports to 1.3
To post a comment you must log in.
PASSED: Continuous integration, rev:491 91.189. 93.70:8080/ job/reminders- app-ci/ 783/ 91.189. 93.70:8080/ job/reminders- app-vivid- amd64-ci/ 205
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/reminders- app-ci/ 783/rebuild
http://