summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-05-03 11:36:44 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-05-03 11:36:44 -0400
commit7970ab05408ec48ffde9bffddb451a8e49ef6fa6 (patch)
tree7a35f9c1051aad9ef717fe5bb003523f8a56713a /.gitignore
parent97429d91d8b9e69756efac3a28105535807221f3 (diff)
parentc83951904066fedc425b82ea4dbf6cab64db7cd6 (diff)
Merge commit 'dkg/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ae9fbd8..80bf65d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*.[ao]
monkeysphere
gpg2ssh
+ssh2gpg