the no-s3 branch is not needed, and there is a new no-ifelse branch

This commit is contained in:
Joey Hess 2012-04-16 16:35:47 -04:00
parent 42cbb41ada
commit 4d221a7a80
2 changed files with 3 additions and 3 deletions

View file

@ -22,8 +22,8 @@ The git repository has some branches:
had a major change to filename encoding.
* `old-monad-control` is for systems that don't have a newer monad-control
library.
* `no-s3` disables the S3 special remote, for systems that lack the
necessary haskell library. (merge it into master if you need it)
* `no-ifelse` avoids using the IFelse library
(merge it into master if you need it)
* `no-bloom` avoids using bloom filters. (merge it into master if you need it)
* `debian-stable` contains the latest backport of git-annex to Debian
stable.

View file

@ -35,7 +35,7 @@ To build and use git-annex, you will need:
* [TestPack](http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack)
* [QuickCheck 2](http://hackage.haskell.org/package/QuickCheck)
* [HTTP](http://hackage.haskell.org/package/HTTP)
* [hS3](http://hackage.haskell.org/package/hS3)
* [hS3](http://hackage.haskell.org/package/hS3) (optional)
* [json](http://hackage.haskell.org/package/json)
* [IfElse](http://hackage.haskell.org/package/IfElse)
* [bloomfilter](http://hackage.haskell.org/package/bloomfilter)