Merge branch 'master' into smudge

This commit is contained in:
Joey Hess 2015-12-21 17:12:46 -04:00
commit d82b110da8
Failed to extract signature
35 changed files with 463 additions and 71 deletions

View file

@ -31,11 +31,12 @@ import System.IO
import System.Posix
import Data.Maybe
import Data.List
import Control.Applicative
import Network.BSD
import System.FilePath
import Data.Hash.MD5
import System.Directory
import Control.Applicative
import Prelude
type LockFile = FilePath