Merge lp://staging/~thomas-voss/media-hub/rebuild-against-dbus-cpp into lp://staging/media-hub
Proposed by
Thomas Voß
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~thomas-voss/media-hub/rebuild-against-dbus-cpp |
| Merge into: | lp://staging/media-hub |
| Diff against target: |
678 lines (+292/-32) (has conflicts) 13 files modified
CMakeLists.txt (+5/-0) README (+4/-0) debian/changelog (+20/-0) include/core/media/track_list.h (+18/-1) src/core/media/mpris/track_list.h (+21/-0) src/core/media/player_implementation.cpp (+12/-0) src/core/media/track_list.cpp (+5/-0) src/core/media/track_list_implementation.cpp (+74/-23) src/core/media/track_list_implementation.h (+1/-0) src/core/media/track_list_skeleton.cpp (+85/-5) src/core/media/track_list_skeleton.h (+2/-0) src/core/media/track_list_stub.cpp (+43/-3) src/core/media/track_list_stub.h (+2/-0) Text conflict in CMakeLists.txt Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~thomas-voss/media-hub/rebuild-against-dbus-cpp |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-11-11.
Commit message
Version bump to force rebuild.
Description of the change
Version bump to force rebuild.
To post a comment you must log in.
Unmerged revisions
- 163. By Thomas Voß
-
Version bump to force rebuild.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
