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
This commit is contained in:
Federico Hernandez 2009-10-22 22:55:01 +02:00
commit bf077c0f97
16 changed files with 59 additions and 53 deletions

View file

@ -1,4 +1,4 @@
#! /bin/bash
#! /bin/sh
date > all.log
@ -14,7 +14,7 @@ END=`tail -1 all.log`
OS=`uname`
case $OS in
Darwin)
Darwin | FreeBSD)
STARTEPOCH=`date -j -f "%a %b %d %T %Z %Y" "${START}" "+%s"`
ENDEPOCH=`date -j -f "%a %b %d %T %Z %Y" "${END}" "+%s"`
;;