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 /.gitignore | |
| parent | b75cb97e42dd3327942d8b32cac2d9ee97e9aa4a (diff) | |
| parent | 9efdaab59edb2ff4454082f6a36c9dc0d90b8885 (diff) | |
Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
Conflicts:
gpg2ssh/Makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1,5 +1,2 @@ *~ *.[ao] -monkeysphere -gpg2ssh -ssh2gpg |