Merge branch 'silver-bullet' into 1.7.0

Conflicts: src/command.cpp
2009-05-13 11:55:21 -04:00
parent 8b045156d0 c4e459e8d7
commit 4346f83f6e
6 changed files with 176 additions and 1 deletions
--- a/src/parse.cpp
+++ b/src/parse.cpp
@@ -129,6 +129,7 @@ static const char* commands[] =
  "delete",
  "done",
  "duplicate",
+  "edit",
  "export",
  "help",
  "history",