diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-24 14:48:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-24 15:01:55 -0400 |
| commit | 42e08cd4575d3dc558dfe172c1f28c752d69e8c6 (patch) | |
| tree | 78a8eddc31c390aaf8f66435bb13db9366f9a7c4 /CmdLine/GitAnnex.hs | |
| parent | 34f375526f44ff255d45bbabcd1425b3d5d0bb4a (diff) | |
| parent | 3b9d9a267b7c9247d36d9b622e1b836724ca5fb0 (diff) | |
Merge branch 'master' into no-xmpp
Diffstat (limited to 'CmdLine/GitAnnex.hs')
| -rw-r--r-- | CmdLine/GitAnnex.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs index a5913e9e0..394bd173b 100644 --- a/CmdLine/GitAnnex.hs +++ b/CmdLine/GitAnnex.hs @@ -52,6 +52,7 @@ import qualified Command.Init import qualified Command.Describe import qualified Command.InitRemote import qualified Command.EnableRemote +import qualified Command.EnableTor import qualified Command.Expire import qualified Command.Repair import qualified Command.Unused @@ -95,18 +96,19 @@ import qualified Command.Direct import qualified Command.Indirect import qualified Command.Upgrade import qualified Command.Forget +import qualified Command.P2P import qualified Command.Proxy import qualified Command.DiffDriver import qualified Command.Smudge import qualified Command.Undo import qualified Command.Version +import qualified Command.RemoteDaemon #ifdef WITH_ASSISTANT import qualified Command.Watch import qualified Command.Assistant #ifdef WITH_WEBAPP import qualified Command.WebApp #endif -import qualified Command.RemoteDaemon #endif import qualified Command.Test #ifdef WITH_TESTSUITE @@ -139,6 +141,7 @@ cmds testoptparser testrunner = , Command.Describe.cmd , Command.InitRemote.cmd , Command.EnableRemote.cmd + , Command.EnableTor.cmd , Command.Reinject.cmd , Command.Unannex.cmd , Command.Uninit.cmd @@ -199,18 +202,19 @@ cmds testoptparser testrunner = , Command.Indirect.cmd , Command.Upgrade.cmd , Command.Forget.cmd + , Command.P2P.cmd , Command.Proxy.cmd , Command.DiffDriver.cmd , Command.Smudge.cmd , Command.Undo.cmd , Command.Version.cmd + , Command.RemoteDaemon.cmd #ifdef WITH_ASSISTANT , Command.Watch.cmd , Command.Assistant.cmd #ifdef WITH_WEBAPP , Command.WebApp.cmd #endif - , Command.RemoteDaemon.cmd #endif , Command.Test.cmd testoptparser testrunner #ifdef WITH_TESTSUITE |