diff options
| author | Julio Merino <jmmv@google.com> | 2016-02-08 11:12:22 -0500 |
|---|---|---|
| committer | Julio Merino <jmmv@meroh.net> | 2016-02-08 20:46:37 -0500 |
| commit | ddbe3bee444909420049a68f7891563f0e431669 (patch) | |
| tree | 1273577a0fd0fa7ce54b426688938b785b442666 /.gitignore | |
| parent | b10d21db3185a2b25e3bd35579f57d3c7b8d882e (diff) | |
| parent | 9bcb98945405db3d64cd8dca409aa18990ff1929 (diff) | |
| download | sshfs-ddbe3bee444909420049a68f7891563f0e431669.tar sshfs-ddbe3bee444909420049a68f7891563f0e431669.tar.gz sshfs-ddbe3bee444909420049a68f7891563f0e431669.tar.bz2 sshfs-ddbe3bee444909420049a68f7891563f0e431669.zip | |
Merge remote-tracking branch 'osxfuse/master' into merge-osxfuse
Pull in all changes from osxfuse's fork of sshfs into libfuse's sshfs.
There need not be two different copies of this codebase, particularly
because libfuse's version is already autoconf-ified and can support
multiple platforms.
The merge is mostly clean with just a few manual edits to resolve
conflicts.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -20,6 +20,7 @@ Makefile *.m4 stamp-h* config.* +sshfs.1 /sshfs /ltmain.sh /configure |