Merge branch 'master' into recurrence

Browse Source

Conflicts:

	src/task.cpp

...

This commit is contained in:

Paul Beckingham

2008-07-08 01:48:41 -04:00

parent ba342eeeb6 95752390de

commit 46ded4c026

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available