Merge lp://qastaging/~charlesk/indicator-datetime/unified-eds-code into lp://qastaging/indicator-datetime/15.10
Proposed by
Charles Kerr
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 431 |
| Merged at revision: | 431 |
| Proposed branch: | lp://qastaging/~charlesk/indicator-datetime/unified-eds-code |
| Merge into: | lp://qastaging/indicator-datetime/15.10 |
| Diff against target: |
39 lines (+4/-2) 3 files modified
CMakeLists.txt (+1/-1) debian/control (+1/-1) src/engine-eds.cpp (+2/-0) |
| To merge this branch: | bzr merge lp://qastaging/~charlesk/indicator-datetime/unified-eds-code |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
change packaging dependencies and add source #ifdefs to support the versions of EDS that ship with vivid and xenial
Description of the change
change packaging dependencies and add source #ifdefs to support the versions of EDS that ship with vivid and xenial
To post a comment you must log in.
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
Looks ok.