taskwarrior/doc/man
Paul Beckingham 8af0a7f3ba 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
2013-04-07 17:56:59 -04:00
..
.gitignore CMake 2011-01-05 22:46:25 +01:00
task-color.5.in Merge branch 'master' into 2.3.0 2013-04-07 17:56:59 -04:00
task-faq.5.in Merge branch 'master' into 2.3.0 2013-04-07 17:56:59 -04:00
task-sync.5.in Merge branch 'master' into 2.3.0 2013-04-07 17:56:59 -04:00
task-tutorial.5.in Merge branch 'master' into 2.3.0 2013-04-07 17:56:59 -04:00
task.1.in Merge branch 'master' into 2.3.0 2013-04-07 17:56:59 -04:00
taskrc.5.in Merge branch 'master' into 2.3.0 2013-04-07 17:56:59 -04:00
tasksh.1 Bug #1197 2013-03-26 23:25:18 -04:00
tasksh.1.in Feature #328 2013-03-10 15:23:06 -04:00