Merge lp://qastaging/~online-accounts/libaccounts-qt/packaging into lp://qastaging/libaccounts-qt
Proposed by
Alberto Mardegan
| Status: | Merged |
|---|---|
| Approved by: | Alberto Mardegan |
| Approved revision: | 151 |
| Merged at revision: | 149 |
| Proposed branch: | lp://qastaging/~online-accounts/libaccounts-qt/packaging |
| Merge into: | lp://qastaging/libaccounts-qt |
| Diff against target: |
574 lines (+163/-49) 27 files modified
.gitlab-ci.yml (+32/-0) Accounts/account-service.cpp (+2/-2) Accounts/account-service.h (+1/-1) Accounts/account.cpp (+1/-1) Accounts/account.h (+1/-1) Accounts/accountscommon.h (+2/-1) Accounts/application.cpp (+17/-1) Accounts/application.h (+23/-20) Accounts/auth-data.cpp (+1/-1) Accounts/auth-data.h (+1/-1) Accounts/error.cpp (+2/-1) Accounts/error.h (+2/-1) Accounts/manager.cpp (+30/-1) Accounts/manager.h (+2/-1) Accounts/manager_p.h (+1/-1) Accounts/provider.cpp (+1/-1) Accounts/provider.h (+1/-1) Accounts/service-type.cpp (+1/-1) Accounts/service-type.h (+1/-1) Accounts/service.cpp (+1/-1) Accounts/service.h (+1/-1) Accounts/utils.cpp (+1/-1) Accounts/utils.h (+1/-1) common-vars.pri (+2/-2) debian/changelog (+12/-0) debian/control (+1/-4) tests/tst_libaccounts.cpp (+22/-1) |
| To merge this branch: | bzr merge lp://qastaging/~online-accounts/libaccounts-qt/packaging |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Online Accounts | Pending | ||
|
Review via email:
|
|||
Description of the change
Merge from upstream
Add Manager:
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
