Merge lp://qastaging/~cyphermox/indicator-datetime/revert277 into lp://qastaging/~indicator-applet-developers/indicator-datetime/trunk.13.10
Proposed by
Mathieu Trudel-Lapierre
Status: | Merged |
---|---|
Approved by: | Ted Gould |
Approved revision: | 279 |
Merged at revision: | 279 |
Proposed branch: | lp://qastaging/~cyphermox/indicator-datetime/revert277 |
Merge into: | lp://qastaging/~indicator-applet-developers/indicator-datetime/trunk.13.10 |
Diff against target: |
1390 lines (+107/-861) 13 files modified
README (+1/-7) configure.ac (+0/-2) debian/control (+0/-1) src/Makefile.am (+0/-2) src/main.c (+4/-45) src/planner-eds.c (+70/-179) src/planner-eds.h (+2/-0) src/planner-mock.c (+0/-178) src/planner-mock.h (+0/-58) src/planner.c (+0/-20) src/planner.h (+2/-4) src/service.c (+27/-359) src/service.h (+1/-6) |
To merge this branch: | bzr merge lp://qastaging/~cyphermox/indicator-datetime/revert277 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Ted Gould (community) | Approve | ||
Review via email:
|
This proposal supersedes a proposal from 2013-10-22.
Description of the change
Revert revision 277 which appears to be more feature than bugfix applicable for SRU.
To post a comment you must log in.
Uhm, this is the 14.04 branch. No need to revert anything here.