Merge branch 'master' (1.8.3) into 1.9.0

Conflicts which were fixed: ChangeLog configure.ac doc/man/task-tutorial.5 doc/man/task.1 doc/man/taskrc.5 src/report.cpp
2009-10-22 22:55:01 +02:00
parent d321ee242d e2e0851a69
commit bf077c0f97
16 changed files with 59 additions and 53 deletions
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -30,6 +30,7 @@
 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "Context.h"
 #include "Timer.h"
 #include "text.h"