GTG

Merge lp://staging/~bryce/gtg/0.3-refactor into lp://staging/~gtg/gtg/old-trunk

  1. 0.3-refactor
  2. Merge into old-trunk
Proposed by Bryce Harrington
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~bryce/gtg/0.3-refactor
Merge into: lp://staging/~gtg/gtg/old-trunk
Diff against target: 370 lines (+86/-56)
6 files modified
GTG/core/datastore.py (+13/-12)
GTG/core/plugins/api.py (+1/-1)
GTG/plugins/import_json/import_json.py (+2/-12)
GTG/taskbrowser/browser.py (+7/-7)
GTG/taskbrowser/taskbrowser.glade (+24/-24)
GTG/tools/readurl.py (+39/-0)
To merge this branch: bzr merge lp://staging/~bryce/gtg/0.3-refactor
Reviewer Review Type Date Requested Status
Lionel Dricot (community) Needs Fixing
Review via email: mp+24190@code.staging.launchpad.net

Description of the change

Some follow on changes to my earlier glade refactoring work.

To post a comment you must log in.
Revision history for this message
Lionel Dricot (ploum-deactivatedaccount) wrote :

Hello Bryce,

It looks like there's a conflict in datastore.py. Could you solve it ?

Thanks !

review: Needs Fixing
lp://staging/~bryce/gtg/0.3-refactor updated
723. By Bryce Harrington

Resolve merge conflict

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

to status/vote changes: