Merge branch 'master' into 2.3.0

Conflicts:
	AUTHORS
	CMakeLists.txt
	INSTALL
	NEWS
	cmake.h.in
	doc/man/task-faq.5.in
	package-config/osx/README
	scripts/utils/verify_l10n
	src/API.h
	src/Config.cpp
	src/Context.cpp
	src/DOM.cpp
	src/Hooks.cpp
	src/TransportShell.h
	src/commands/CmdDiagnostics.cpp
	src/commands/CmdShell.cpp
	src/commands/CmdVersion.cpp
	src/en-US.h
	src/shell/Readline.h
	src/wcwidth6.cpp
	test/CMakeLists.txt
	test/color.uda.t
	test/duration.t.cpp
	test/hook.on-launch.t
	test/template.t
	test/uuid.t
This commit is contained in:
Paul Beckingham 2013-04-07 17:51:24 -04:00
commit 8af0a7f3ba
548 changed files with 13752 additions and 2435 deletions

View file

@ -1,4 +1,4 @@
.TH task-faq 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
.TH task-faq 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
.SH NAME
task-faq \- A FAQ for the task(1) command line todo manager.
@ -335,7 +335,7 @@ This will remove the second annotation - the first non-exact match.
.B Q: How do I show tasks completed on a certain day?
The day in question has to be boxed by a range, like this:
task end.after:3/29/2012 end.before:3/30/2012 completed
task end.after:3/29/2013 end.before:3/30/2013 completed
Note that a single date, such as 3/29/2012 does not refer to a whole day, but
to a single point in time, 3/20/2012 0:00:00.
@ -355,7 +355,7 @@ There are lots of ways. Here are some:
- Fix bugs
.SH "CREDITS & COPYRIGHTS"
Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
Taskwarrior is distributed under the MIT license. See
http://www.opensource.org/licenses/mit-license.php for more information.