Merge lp://staging/~ubuntu-desktop/indicator-datetime/ubuntu into lp://staging/~indicator-applet-developers/indicator-datetime/ubuntu

Proposed by Ken VanDine
Status: Merged
Merged at revision: 58
Proposed branch: lp://staging/~ubuntu-desktop/indicator-datetime/ubuntu
Merge into: lp://staging/~indicator-applet-developers/indicator-datetime/ubuntu
Diff against target: 285 lines (+248/-0) (has conflicts)
3 files modified
debian/changelog (+204/-0)
debian/control (+35/-0)
src/datetime-service.c (+9/-0)
Text conflict in debian/changelog
Text conflict in debian/control
Text conflict in src/datetime-service.c
To merge this branch: bzr merge lp://staging/~ubuntu-desktop/indicator-datetime/ubuntu
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+49095@code.staging.launchpad.net

Description of the change

Updated build depends for eds support and merged with trunk

To post a comment you must log in.
58. By Ted Gould

Merging in U. Desktop changes

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