Merge lp://qastaging/~charlesk/indicator-datetime/lp-1489037-change-default-alarm-sound-15.04 into lp://qastaging/indicator-datetime/15.04

Proposed by Charles Kerr
Status: Merged
Approved by: dobey
Approved revision: 422
Merged at revision: 420
Proposed branch: lp://qastaging/~charlesk/indicator-datetime/lp-1489037-change-default-alarm-sound-15.04
Merge into: lp://qastaging/indicator-datetime/15.04
Diff against target: 140 lines (+22/-16)
9 files modified
data/com.canonical.indicator.datetime.gschema.xml.in (+1/-1)
debian/changelog (+6/-0)
src/snap.cpp (+1/-1)
tests/test-eds-ics-missing-trigger.cpp (+1/-1)
tests/test-eds-ics-missing-trigger.ics (+2/-2)
tests/test-eds-ics-nonrepeating-events.cpp (+1/-1)
tests/test-eds-ics-nonrepeating-events.ics (+1/-1)
tests/test-eds-ics-repeating-events.cpp (+8/-8)
tests/test-eds-ics-repeating-events.ics (+1/-1)
To merge this branch: bzr merge lp://qastaging/~charlesk/indicator-datetime/lp-1489037-change-default-alarm-sound-15.04
Reviewer Review Type Date Requested Status
Pete Woods (community) Approve
Review via email: mp+273697@code.qastaging.launchpad.net

Commit message

Change the default alarm sound from 'suru arpeggio' to 'alarm clock'.

Description of the change

Change the default alarm sound from 'suru arpeggio' to 'alarm clock'.

This is fixed in 15.10 but that patch doesn't apply cleanly to 15.04, so here it is again in 15.04 form.

To post a comment you must log in.
Revision history for this message
Pete Woods (pete-woods) :
review: Approve

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