mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'new-monad-control'

Browse source 
Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2011-12-30 20:06:15 -04:00
commit 8f4fdb3f97
7 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/install.mdwn
View file

@ -25,6 +25,7 @@ To build and use git-annex, you will need:
* [SHA](http://hackage.haskell.org/package/SHA)
* [dataenc](http://hackage.haskell.org/package/dataenc)
* [monad-control](http://hackage.haskell.org/package/monad-control)
* [lifted-base](http://hackage.haskell.org/package/lifted-base)
* [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)

2
doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn
View file

@ -5,3 +5,5 @@ Git-annex doesn't compile with the latest version of monad-control. Would it be
>
> There is now a branch in git called `new-monad-control` that will build
> with the new monad-control. --[[Joey]]
>> Now merged to master. [[done]] --[[Joey]]