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
This commit is contained in:
Federico Hernandez 2012-09-18 22:58:59 +02:00
commit a3242f7b5b
19 changed files with 175 additions and 79 deletions

9
NEWS
View file

@ -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
-
---