Merge branch '1.4.3' of git@github.com:pbeckingham/task into 1.4.3

Conflicts: ChangeLog html/task.html src/task.cpp
2008-11-02 21:50:55 -05:00
parent b0e18de1b6 47ffc0babc
commit ce42ae9622
35 changed files with 620 additions and 258 deletions
--- a/src/parse.cpp
+++ b/src/parse.cpp
@@ -142,7 +142,6 @@ static const char* commands[] =
  "tags",
  "undelete",
  "undo",
-  "usage",
  "version",
  "",
 };