mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-08-29 17:07:19 +02:00
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:
commit
bf077c0f97
16 changed files with 59 additions and 53 deletions
|
@ -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"`
|
||||
;;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue