Merge lp://staging/~vollkorn/pomodoro-timer/adjustabletimes into lp://staging/pomodoro-timer

Proposed by Chris Sims
Status: Approved
Approved by: Chris Sims
Approved revision: 13
Proposed branch: lp://staging/~vollkorn/pomodoro-timer/adjustabletimes
Merge into: lp://staging/pomodoro-timer
Diff against target: 97 lines (+55/-9)
1 file modified
bin/pomodorotimer (+55/-9)
To merge this branch: bzr merge lp://staging/~vollkorn/pomodoro-timer/adjustabletimes
Reviewer Review Type Date Requested Status
Chris Sims Approve
Review via email: mp+43151@code.staging.launchpad.net

Description of the change

Add changes from Jan. Start on database integration and user-defined options.

To post a comment you must log in.
Revision history for this message
Chris Sims (jcsims) :
review: Approve

Unmerged revisions

13. By Jan Girlich

Basic storing of timer settings with CouchDB

12. By Jan Girlich

just adding the link to my branche to the bug

11. By Jan Girlich

fixed bugs #646319 and started work on changing time handling

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 all changes: