aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTORS
diff options
context:
space:
mode:
authorPetter Rodhelind <petter.rodhelind@gmail.com>2017-08-01 23:51:51 +0200
committerPetter Rodhelind <petter.rodhelind@gmail.com>2017-08-01 23:51:51 +0200
commit810cecc30d4cefe40401051a8e877665292a594d (patch)
tree6565ac720dede033d0ad88bee1fc29ee38b4baad /CONTRIBUTORS
parent7d0663b7c023cd7dd2764cb232798f8bc1309c20 (diff)
parent4a8c0c75ffd40d08837d6937e1e995c68ceb276e (diff)
downloadplan9port-810cecc30d4cefe40401051a8e877665292a594d.tar.gz
plan9port-810cecc30d4cefe40401051a8e877665292a594d.tar.bz2
plan9port-810cecc30d4cefe40401051a8e877665292a594d.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'CONTRIBUTORS')
-rw-r--r--CONTRIBUTORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0b9a5415..871c7574 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -35,6 +35,7 @@ Marius Eriksen <marius.eriksen@gmail.com>
Martin Neubauer <m.ne@gmx.net>
Mathieu Lonjaret <lejatorn@gmail.com>
Mathieu Lonjaret <mathieu.lonjaret@gmail.com>
+Michael Stroucken <mxs@cmu.edu>
Michael Teichgräber <mt4swm@googlemail.com>
Michael Teichgräber <mt@ib.wmipf.de>
Nathaniel W Filardo <nwf@cs.jhu.edu> <nwfilardo@gmail.com>