summaryrefslogtreecommitdiff
path: root/debian/monkeysphere.manpages
diff options
context:
space:
mode:
authorMatt Goins <mjgoins@openflows.com>2008-06-20 14:23:41 -0400
committerMatt Goins <mjgoins@openflows.com>2008-06-20 14:23:41 -0400
commit3a6f611a52d56b919b8c50a6e1700af43ff49578 (patch)
tree1bbbb9fef2438c47c5801ea822099c97fabdcf6f /debian/monkeysphere.manpages
parentb75cb97e42dd3327942d8b32cac2d9ee97e9aa4a (diff)
parent9efdaab59edb2ff4454082f6a36c9dc0d90b8885 (diff)
Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
Conflicts: gpg2ssh/Makefile
Diffstat (limited to 'debian/monkeysphere.manpages')
-rw-r--r--debian/monkeysphere.manpages4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/monkeysphere.manpages b/debian/monkeysphere.manpages
new file mode 100644
index 0000000..a8f6c16
--- /dev/null
+++ b/debian/monkeysphere.manpages
@@ -0,0 +1,4 @@
+man/man1/monkeysphere.1
+man/man1/openpgp2ssh.1
+man/man1/monkeysphere-ssh-proxycommand.1
+man/man8/monkeysphere-server.8