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
548 changed files with 13752 additions and 2435 deletions

10
NEWS
View File

@@ -13,19 +13,19 @@ New commands in taskwarrior 2.3.0
New configuration options in taskwarrior 2.3.0
-
-
Newly deprecated features in taskwarrior 2.3.0
-
-
---
Taskwarrior has been built and tested on the following configurations:
* OS X 10.7 Lion, 10.6 Snow Leopard
* Fedora 17 Beefy Miracle and 16 Verne
* Ubuntu 12.04 Precise Pangolin and 11.10 Oneiric Ocelot
* OS X 10.8 Mountain Lion and 10.7 Lion
* Fedora 18 Spherical Cow and 17 Beefy Miracle
* Ubuntu 12.10 Quantal Quetzal and 12.04 Precise Pangolin
* Debian 6.0 Squeeze (stable)i and 5.0 Lenny (oldstable) plus Sid (testing)
* Slackware 13.37
* Arch Linux