diff options
author | Joey Hess <joey@kitenet.net> | 2010-11-09 15:05:08 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-11-09 15:05:08 -0400 |
commit | 75d29250823326c8b4894a855927f65b5fdf4e13 (patch) | |
tree | a888b86d8e0569b9e1c388700dd6717aaa175834 /Command.hs | |
parent | 377bf24d9a951186b374cd7a3f920b6bc9deb8f1 (diff) | |
parent | 8d5374f4a33f398baa166035e5fafb716a78fd1d (diff) |
Merge branch 'master' into checkout
Conflicts:
debian/changelog
doc/backends.mdwn
Diffstat (limited to 'Command.hs')
-rw-r--r-- | Command.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command.hs b/Command.hs index a0e3280d6..f896a53f6 100644 --- a/Command.hs +++ b/Command.hs @@ -9,7 +9,7 @@ module Command where import Types import qualified Backend -import Core +import Messages import qualified Annex {- A subcommand runs in four stages. |