Merge branch '1.8.0'

Conflicts:
	.gitignore
	AUTHORS
	ChangeLog
	DEVELOPERS
	Makefile.am
	NEWS
	README
	configure.ac
	doc/man/task.1
	doc/man/taskrc.5
	src/T.cpp
	src/T.h
	src/TDB.cpp
	src/TDB.h
	src/command.cpp
	src/edit.cpp
	src/import.cpp
	src/parse.cpp
	src/report.cpp
	src/rules.cpp
	src/task.cpp
	src/task.h
	task_completion.sh
This commit is contained in:
Paul Beckingham 2009-07-21 19:15:54 -04:00
commit 90d53245c3
231 changed files with 16844 additions and 11820 deletions

7
.gitignore vendored
View file

@ -5,11 +5,14 @@ config.h.in
config.status
src/.deps
src/Makefile
*/task
*/*task
stamp-h1
Makefile
Makefile.in
configure
config.log
www.xls
src/tests/all.log
src/tests/*.data
*~
Makefile.in
.*.swp