aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorNikolaus Rath <Nikolaus@rath.org>2016-02-10 19:53:49 -0800
committerNikolaus Rath <Nikolaus@rath.org>2016-02-10 19:53:49 -0800
commite812e29d39f0e7aaf9ead9a19a9a4f288300a7e2 (patch)
treeff8fd1c17b9be6d1aba7ff365614b10e41a1223b /AUTHORS
parentb10d21db3185a2b25e3bd35579f57d3c7b8d882e (diff)
parent80db43d7dce4f3979fe5e92b2d616d635f21029d (diff)
downloadsshfs-e812e29d39f0e7aaf9ead9a19a9a4f288300a7e2.tar
sshfs-e812e29d39f0e7aaf9ead9a19a9a4f288300a7e2.tar.gz
sshfs-e812e29d39f0e7aaf9ead9a19a9a4f288300a7e2.tar.bz2
sshfs-e812e29d39f0e7aaf9ead9a19a9a4f288300a7e2.zip
Merge pull request #5 from jmmv/merge-osxfuse
Merge osxfuse.
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS4
1 files changed, 4 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 21a9b75..9f05a8f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,8 +15,12 @@ Contributors (autogenerated list)
Alan Jenkins <alan.christopher.jenkins@gmail.com>
Alexander Neumann <alexander@bumpern.de>
+Benjamin Fleischer <fleiben@gmail.com>
Chris Wolfe <cwolfe@chromium.org>
+Google Inc.
+Julio Merino <jmmv@google.com>
Mike Kelly <mike@pair.com>
Miklos Szeredi <miklos@szeredi.hu>
Nikolaus Rath <Nikolaus@rath.org>
Percy Jahn <email@percyjahn.de>
+Qais Patankar <qaisjp@gmail.com>