Merge lp://staging/~jonas-drange/ubuntu-settings-components/apl into lp://staging/ubuntu-settings-components
Proposed by
Jonas G. Drange
| Status: | Merged |
|---|---|
| Approved by: | Nick Dedekind |
| Approved revision: | 181 |
| Merged at revision: | 179 |
| Proposed branch: | lp://staging/~jonas-drange/ubuntu-settings-components/apl |
| Merge into: | lp://staging/ubuntu-settings-components |
| Diff against target: |
418 lines (+206/-15) 7 files modified
debian/changelog (+7/-0) plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml (+3/-1) plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml (+42/-5) plugins/Ubuntu/Settings/Fingerprint/Setup.qml (+3/-5) plugins/Ubuntu/Settings/Vpn/VpnEditor.qml (+3/-2) tests/qmltests/Fingerprint/tst_FingerprintNames.qml (+18/-0) tests/qmltests/Fingerprint/tst_Fingerprints.qml (+130/-2) |
| To merge this branch: | bzr merge lp://staging/~jonas-drange/ubuntu-settings-components/apl |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Nick Dedekind (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
* Fix issues discovered when migrating USS to APL.
* Bump version so as to allow USS to complete the migration.
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
Looks ok