Merge lp://qastaging/~stolowski/unity-scope-mediascanner/api-0.4.0 into lp://qastaging/unity-scope-mediascanner
Proposed by
Paweł Stołowski
| Status: | Merged |
|---|---|
| Merged at revision: | 69 |
| Proposed branch: | lp://qastaging/~stolowski/unity-scope-mediascanner/api-0.4.0 |
| Merge into: | lp://qastaging/unity-scope-mediascanner |
| Prerequisite: | lp://qastaging/~marcustomlinson/unity-scope-mediascanner/add_scope_author |
| Diff against target: |
670 lines (+123/-93) 24 files modified
CMakeLists.txt (+1/-1) data/CMakeLists.txt (+36/-12) data/mediascanner-music.ini.in (+2/-2) data/mediascanner-video.ini.in (+2/-2) data/musicaggregator.ini.in (+2/-2) data/videoaggregator.ini.in (+2/-2) debian/changelog (+6/-0) debian/control (+1/-1) debian/unity-scope-mediascanner2.install (+4/-0) src/CMakeLists.txt (+4/-4) src/music-scope.cpp (+10/-10) src/music-scope.h (+7/-6) src/musicaggregatorquery.cpp (+4/-6) src/musicaggregatorquery.h (+4/-4) src/musicaggregatorscope.cpp (+3/-3) src/musicaggregatorscope.h (+3/-3) src/resultforwarder.h (+3/-3) src/video-scope.cpp (+8/-8) src/video-scope.h (+6/-6) src/videoaggregatorquery.cpp (+4/-6) src/videoaggregatorquery.h (+4/-4) src/videoaggregatorscope.cpp (+3/-3) src/videoaggregatorscope.h (+2/-3) tests/test-music-scope.cpp (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~stolowski/unity-scope-mediascanner/api-0.4.0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Unity Team | Pending | ||
|
Review via email:
|
|||
Commit message
Updated for unity-scopes-api 0.4.0.
Description of the change
Updated for unity-scopes-api 0.4.0.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:69
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://