diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-30 20:06:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-30 20:08:01 -0400 |
| commit | 8f4fdb3f9782fd39e48cb0a6d3e82866b9b1a976 (patch) | |
| tree | 12bd96c3d3b47b203f0fac44977a558b183cb13a /Annex/BranchState.hs | |
| parent | 5287d1dc3f293b6eb7f6759fe9f25be1ad85fbae (diff) | |
| parent | 85f1f3a63a025204e931959ec9c5ae2a7812ddff (diff) | |
Merge branch 'new-monad-control'
Conflicts:
debian/changelog
Diffstat (limited to 'Annex/BranchState.hs')
0 files changed, 0 insertions, 0 deletions