Merge lp:~ubuntu-branches/ubuntu/natty/evolution-mapi/natty-201103250158 into lp:ubuntu/natty/evolution-mapi
Proposed by
James Westby
Status: | Work in progress |
---|---|
Proposed branch: | lp:~ubuntu-branches/ubuntu/natty/evolution-mapi/natty-201103250158 |
Merge into: | lp:ubuntu/natty/evolution-mapi |
Diff against target: |
66 lines (+60/-0) (has conflicts) 1 file modified
debian/patches/02_recurring_events (+60/-0) Conflict adding file debian/patches/02_recurring_events. Moved existing file to debian/patches/02_recurring_events.moved. |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/natty/evolution-mapi/natty-201103250158 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+55057@code.launchpad.net |
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/evolution-mapi now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/evolution-mapi/natty-201103250158. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 15. By Chuck Short
-
* Add patch 02_recurring_
events: fix recurring events not showing from
Exchange 2007. LP: #513394
* Add 'Enhances: evolution' for evolution-mapi.