summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/install.mdwn1
-rw-r--r--doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn2
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/install.mdwn b/doc/install.mdwn
index cc26ee91d..ceaa3544f 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -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)
diff --git a/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn b/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn
index ca68c2c91..f82224991 100644
--- a/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn
+++ b/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn
@@ -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]]