diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-14 15:37:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-14 15:37:24 -0400 |
| commit | ea7f916c04e0b1ee022b3e4987be749db28fa2fa (patch) | |
| tree | 0698a987c4b475fdccfe48bb2a8f1abebf55b844 /doc/install/fromscratch.mdwn | |
| parent | c2f6f82a146339bb4b94acff1aae4f12ad023a08 (diff) | |
| parent | 724d5185d48aee309af1a6d13927c4f7108610fd (diff) | |
Merge branch 'master' into windows
Conflicts:
Annex/Environment.hs
Build/Configure.hs
Git/Construct.hs
Utility/FileMode.hs
Diffstat (limited to 'doc/install/fromscratch.mdwn')
| -rw-r--r-- | doc/install/fromscratch.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/install/fromscratch.mdwn b/doc/install/fromscratch.mdwn index 2112a01f0..15539d1f4 100644 --- a/doc/install/fromscratch.mdwn +++ b/doc/install/fromscratch.mdwn @@ -21,7 +21,7 @@ quite a lot. * [SafeSemaphore](http://hackage.haskell.org/package/SafeSemaphore) * [UUID](http://hackage.haskell.org/package/uuid) * [regex-tdfa](http://hackage.haskell.org/package/regex-tdfa) -* Optional haskell stuff, used by the [[assistant]] and its webapp (edit Makefile to disable) +* Optional haskell stuff, used by the [[assistant]] and its webapp * [stm](http://hackage.haskell.org/package/stm) (version 2.3 or newer) * [hinotify](http://hackage.haskell.org/package/hinotify) |