Merge branch 'master' into 2.2.0

- merge of 2.1.2 release being now the current released version in master. Conflicts: CMakeLists.txt NEWS test/bug.1104.t test/run_all
2012-09-18 22:58:59 +02:00
parent d8a4aab85b b93f384b3a
commit a3242f7b5b
19 changed files with 175 additions and 79 deletions
--- a/9
+++ b/9
@@ -6,20 +6,17 @@ New Features in taskwarrior 2.2.0
  - Deprectated 'fg' and 'bg' attributes removed.  Any residual use of those
    will appear as orphaned UDAs.

-  Please refer to the ChangeLog file for full details.  There are too many to
-  list here.
-
 New commands in taskwarrior 2.2.0

  - New '_aliases' helper command lists aliases for completion purposes.

 New configuration options in taskwarrior 2.2.0

-  - 
+  -

 Newly deprecated features in taskwarrior 2.2.0
-
-  - None
+  
+  -

 ---