assistant branch merged in

This commit is contained in:
Joey Hess 2012-08-27 15:01:05 -04:00
parent 38f35f821e
commit 20335ddec9

View file

@ -18,7 +18,6 @@ others need some manual work. See [[install]] for details.
The git repository has some branches: The git repository has some branches:
* `assistant` contains the new change-tracking daemon
* `ghc7.0` supports versions of ghc older than 7.4, which * `ghc7.0` supports versions of ghc older than 7.4, which
had a major change to filename encoding. had a major change to filename encoding.
* `old-monad-control` is for systems that don't have a newer monad-control * `old-monad-control` is for systems that don't have a newer monad-control