diff options
author | Matt Goins <mjgoins@openflows.com> | 2008-06-20 14:23:41 -0400 |
---|---|---|
committer | Matt Goins <mjgoins@openflows.com> | 2008-06-20 14:23:41 -0400 |
commit | 3a6f611a52d56b919b8c50a6e1700af43ff49578 (patch) | |
tree | 1bbbb9fef2438c47c5801ea822099c97fabdcf6f /debian/monkeysphere.docs | |
parent | b75cb97e42dd3327942d8b32cac2d9ee97e9aa4a (diff) | |
parent | 9efdaab59edb2ff4454082f6a36c9dc0d90b8885 (diff) |
Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
Conflicts:
gpg2ssh/Makefile
Diffstat (limited to 'debian/monkeysphere.docs')
-rw-r--r-- | debian/monkeysphere.docs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/monkeysphere.docs b/debian/monkeysphere.docs new file mode 100644 index 0000000..4b8144e --- /dev/null +++ b/debian/monkeysphere.docs @@ -0,0 +1,2 @@ +doc/README +doc/MonkeySpec |