summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorPaulMeng <baolmeng@gmail.com>2016-04-20 14:43:18 -0500
committerPaulMeng <baolmeng@gmail.com>2016-04-20 14:43:18 -0500
commit904ffb6e73402bae537aa89e7fd8f0ab2e9d60e2 (patch)
treed96bb0c974bdea6170957d3e39d47a98f5c85ca0 /.mailmap
parenta0054e9cc78822416d745e955c30f69cbb2a3aa7 (diff)
update from the master
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap27
1 files changed, 18 insertions, 9 deletions
diff --git a/.mailmap b/.mailmap
index eaae8872c..2f59d2e75 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,16 +1,25 @@
-Morgan Deters <mdeters@cs.nyu.edu> <mdeters@cs.nyu.edu>
-Morgan Deters <mdeters@cs.nyu.edu> <mdeters@gmail.com>
-Dejan Jovanovic <dejan@cs.nyu.edu> <dejan@cs.nyu.edu>
-Dejan Jovanovic <dejan@cs.nyu.edu> <dejan.jovanovic@gmail.com>
-Francois Bobot <francois@bobot.eu> <francois@bobot.eu>
-Liana Hadarean <lianah@cs.nyu.edu> <lianah@cs.nyu.edu>
-Liana Hadarean <lianah@cs.nyu.edu> <lianahady@gmail.com>
Andrew Reynolds <andrew.j.reynolds@gmail.com> <andrew.j.reynolds@gmail.com>
-Andrew Reynolds <andrew.j.reynolds@gmail.com> <reynolds@laraserver2.epfl.ch>
+Andrew Reynolds <andrew.j.reynolds@gmail.com> <ajreynol@r-lnx214.cs.uiowa.edu>
Andrew Reynolds <andrew.j.reynolds@gmail.com> <reynolds@larapc05.epfl.ch>
+Andrew Reynolds <andrew.j.reynolds@gmail.com> <reynolds@laraserver2.epfl.ch>
Cesare Tinelli <cesare-tinelli@uiowa.edu> <cesare-tinelli@uiowa.edu>
Christopher L. Conway <christopherleeconway@gmail.com> <christopherleeconway@gmail.com>
Clark Barrett <barrett@cs.nyu.edu> <barrett@cs.nyu.edu>
+Clark Barrett <barrett@cs.nyu.edu> <clarkbarrett@google.com>
+Dejan Jovanovic <dejan@cs.nyu.edu> <dejan.jovanovic@gmail.com>
+Dejan Jovanovic <dejan@cs.nyu.edu> <dejan@cs.nyu.edu>
+Dejan Jovanovic <dejan@cs.nyu.edu> <dejan@csl.sri.com>
+Francois Bobot <francois@bobot.eu> <francois@bobot.eu>
+Guy Katz <katz911@gmail.com> <katz911@gmail.com>
Kshitij Bansal <kshitij@cs.nyu.edu> <kshitij@cs.nyu.edu>
+Liana Hadarean <lianah@cs.nyu.edu> <lianah@cs.nyu.edu>
+Liana Hadarean <lianah@cs.nyu.edu> <lianahady@gmail.com>
+Martin Brain <martin.brain@cs.ox.ac.uk> <>
+Martin Brain <martin.brain@cs.ox.ac.uk> <martin.brain@cs.ox.ac.uk>
+Morgan Deters <mdeters@cs.nyu.edu> <mdeters@cs.nyu.edu>
+Morgan Deters <mdeters@cs.nyu.edu> <mdeters@gmail.com>
+Morgan Deters <mdeters@cs.nyu.edu> <mdeters@morgandeters.com>
Tianyi Liang <tianyi-liang@uiowa.edu> <tianyi-liang@uiowa.edu>
-Tim King <taking@cs.nyu.edu> <taking@cs.nyu.edu>
+Tim King <taking@google.com> <taking@cs.nyu.edu>
+Tim King <taking@google.com> <taking@google.com>
+Tim King <taking@google.com> <tim.king@imag.fr>
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback