summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2017-01-31 13:19:03 -0500
committerSteve Klabnik <steve@steveklabnik.com>2017-01-31 13:19:03 -0500
commit4b52600b152a2220dca847046962a6f37a773378 (patch)
tree1b946e9e9233bbc516e138edfbf5814928cc9013 /.mailmap
parentAuto merge of #39379 - segevfiner:fix-backtraces-on-i686-pc-windows-gnu, r=al... (diff)
downloadgrust-4b52600b152a2220dca847046962a6f37a773378.tar.gz
grust-4b52600b152a2220dca847046962a6f37a773378.tar.bz2
grust-4b52600b152a2220dca847046962a6f37a773378.tar.xz
update mailmap for @pliniker
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index c44c486831..1ae0aae2d0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -167,6 +167,7 @@ Ožbolt Menegatti <ozbolt.menegatti@gmail.com> gareins <ozbolt.menegatti@gmail.c
167Paul Faria <paul_faria@ultimatesoftware.com> Paul Faria <Nashenas88@gmail.com> 167Paul Faria <paul_faria@ultimatesoftware.com> Paul Faria <Nashenas88@gmail.com>
168Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com> 168Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com>
169Peter Elmers <peter.elmers@yahoo.com> <peter.elmers@rice.edu> 169Peter Elmers <peter.elmers@yahoo.com> <peter.elmers@rice.edu>
170Peter Liniker <peter.liniker+github@gmail.com>
170Peter Zotov <whitequark@whitequark.org> 171Peter Zotov <whitequark@whitequark.org>
171Phil Dawes <phil@phildawes.net> Phil Dawes <pdawes@drw.com> 172Phil Dawes <phil@phildawes.net> Phil Dawes <pdawes@drw.com>
172Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com> 173Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com>