diff options
| author | Micah Anderson <micah@riseup.net> | 2008-06-18 23:35:20 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2008-06-18 23:35:20 -0400 |
| commit | 308aa104f66a40f2426c13b96f48631937502f6b (patch) | |
| tree | 55e1b1427ba23750b0c239e5d43fc3ffa49b0293 /.gitignore | |
| parent | a9a56853a27e1dbce3c48af327b0adff0e4c38e0 (diff) | |
| parent | 9c94e937fbe8beb56956365cac07d6eff45215cd (diff) | |
Merge commit 'dkg/master'
Conflicts:
doc/MonkeySpec
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1,5 +1,2 @@ *~ *.[ao] -monkeysphere -gpg2ssh -ssh2gpg |