aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThéo Zimmermann2020-04-29 22:10:00 +0200
committerThéo Zimmermann2020-04-29 22:10:00 +0200
commit5e611ecb1c38860ee5aaa0ccde1bb982ccc43ae4 (patch)
tree142bdff5b451234d2d52edfd34148f72fb4559da
parent62105448c40adfff86c9b191e6de2335839a7b37 (diff)
parentc8a6991f425ac843ce692df28cc02b9c408f9c1b (diff)
Merge PR #12209: Merge duplicates in .mailmap
Reviewed-by: Zimmi48 Ack-by: rnrand
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index ce7c9cda0b..6474a9d164 100644
--- a/.mailmap
+++ b/.mailmap
@@ -115,11 +115,13 @@ Russell O'Connor <roconnor@blockstream.io> roconnor-blockstream <roconno
Christine Paulin <cpaulin@gforge> cpaulin <cpaulin@85f007b7-540e-0410-9357-904b9bb8a0f7>
Christine Paulin <cpaulin@gforge> mohring <mohring@85f007b7-540e-0410-9357-904b9bb8a0f7>
Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> Pierre-Marie Pédrot <pierre-marie.pedrot@irif.fr>
Frederic Peschanski <frederic.peschanski@lip6.fr> fredokun <frederic.peschanski@lip6.fr>
Clément Pit-Claudel <clement.pitclaudel@live.com> Clément Pit--Claudel <clement.pitclaudel@live.com>
Clément Pit-Claudel <clement.pitclaudel@live.com> Clément Pit-Claudel <cpitclaudel@users.noreply.github.com>
Loïc Pottier <pottier@gforge> pottier <pottier@85f007b7-540e-0410-9357-904b9bb8a0f7>
Matthias Puech <puech@gforge> puech <puech@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Robert Rand <rnrand@gmail.com> Robert Rand <rxtreme@gmail.com>
Lars Rasmusson <lars.rasmusson@sics.se> larsr <Lars.Rasmusson@sics.se>
Lars Rasmusson <lars.rasmusson@sics.se> larsr <Lars.Rasmusson@gmail.com>
Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> ddr <ddr@85f007b7-540e-0410-9357-904b9bb8a0f7>