Merge lp://staging/~stolowski/unity-lens-music/smartscopes-into-trunk into lp://staging/unity-lens-music
Proposed by
Paweł Stołowski
| Status: | Merged |
|---|---|
| Approved by: | Łukasz Zemczak |
| Approved revision: | 139 |
| Merged at revision: | 136 |
| Proposed branch: | lp://staging/~stolowski/unity-lens-music/smartscopes-into-trunk |
| Merge into: | lp://staging/unity-lens-music |
| Diff against target: |
2243 lines (+759/-435) 31 files modified
.bzrignore (+43/-0) Makefile.am (+9/-10) banshee.scope.in.in (+14/-0) configure.ac (+21/-15) data/Makefile.am (+2/-2) data/unity-scope-music.service.in (+1/-1) debian/changelog (+6/-0) debian/control (+3/-2) debian/unity-lens-music.install (+3/-2) debian/unity-scope-musicstores.install (+1/-1) musicstore.scope.in.in (+9/-0) po/POTFILES.in (+3/-1) rhythmbox.scope.in.in (+8/-6) src/Makefile.am (+9/-3) src/album.vala (+5/-2) src/banshee-collection.vala (+6/-3) src/banshee-scope.vala (+6/-9) src/categories.vala (+1/-1) src/config.vala.in (+4/-0) src/daemon.vala (+11/-103) src/main.vala (+4/-3) src/musicstore-collection.vala (+30/-8) src/musicstore-daemon.vala (+10/-4) src/musicstore-scope.vala (+268/-34) src/player.vala (+1/-0) src/rhythmbox-collection.vala (+5/-2) src/rhythmbox-scope.vala (+6/-14) src/simple-scope.vala (+98/-20) src/ubuntuone-webservices.vala (+103/-71) tests/unit/Makefile.am (+3/-2) tests/unit/test-ubuntuone-purchases.vala (+66/-116) |
| To merge this branch: | bzr merge lp://staging/~stolowski/unity-lens-music/smartscopes-into-trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Łukasz Zemczak | Approve | ||
|
Review via email:
|
|||
Commit message
Merged smart scopes branch.
Description of the change
Merged smart scopes branch.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:137
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://