gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into 2.2.0

Browse Source 
- 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
parent d8a4aab85b b93f384b3a
commit a3242f7b5b
19 changed files with 175 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,6 +1,12 @@
------ current release ---------------------------
2.2.0 ()
2.1.2 (2012-09-18) 1e3176ed70d2b50faf03838d0df279b2a4ae93b2
Bugs
+ Bug fix release regarding #1104, which causes duplicate UUIDs during
the merge command.
+ Fixed bug where shadow files are not properly created when there is a missing
.taskrc file (thanks to Pietro Cerutti).
Features
+ Added Feature #1069, which gives a clearer error when a UDA