Merge lp://qastaging/~laney/indicator-datetime/eds-3.16 into lp://qastaging/indicator-datetime/15.10

Proposed by Iain Lane
Status: Merged
Approved by: Iain Lane
Approved revision: 414
Merged at revision: 418
Proposed branch: lp://qastaging/~laney/indicator-datetime/eds-3.16
Merge into: lp://qastaging/indicator-datetime/15.10
Diff against target: 597 lines (+355/-30)
9 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+13/-0)
debian/control (+1/-1)
src/engine-eds.cpp (+69/-28)
tests/CMakeLists.txt (+2/-0)
tests/test-eds-ics-tzids-2.cpp (+88/-0)
tests/test-eds-ics-tzids-2.ics (+38/-0)
tests/test-eds-ics-tzids.cpp (+87/-0)
tests/test-eds-ics-tzids.ics (+56/-0)
To merge this branch: bzr merge lp://qastaging/~laney/indicator-datetime/eds-3.16
Reviewer Review Type Date Requested Status
Iain Lane Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+265287@code.qastaging.launchpad.net

Commit message

Update for e-d-s 3.16

Description of the change

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
Iain Lane (laney) wrote :

Self approving since https://code.launchpad.net/~robert-ancell/indicator-datetime/libecal-3.16/+merge/260789 was approved and it's functionally the same.

Thanks robert_ancell. :)

review: Approve
415. By Iain Lane

Merge with 15.04 branch which is what got uploaded to the archive

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches