summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorChristopher Michael <devilhorns@comcast.net>2020-03-24 16:52:29 -0400
committerChristopher Michael <devilhorns@comcast.net>2020-03-24 16:52:29 -0400
commitbdf4e55edf6b6685bfc143045d884c0e5af7707a (patch)
treec0967b5ae3059d8465c9a75d7ccbe9b914dc00f1 /.mailmap
parent94a80803558a682e78b53e190b23c32b54200c65 (diff)
downloadefl-bdf4e55edf6b6685bfc143045d884c0e5af7707a.tar.gz
Revert "efl/mailmap: Remove old unused addresses"
Revert these in favor of reorder so we can keep history This reverts commit 94a80803558a682e78b53e190b23c32b54200c65.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 5 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index c312d8b2ca..354eab2bd5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,10 +22,15 @@ Tom Hacohen <tom@stosb.com> Tom <tom@stosb.com>
Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <gustavo.barbieri@intel.com>
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@comcast.net>
+Christopher Michael <devilhorns@comcast.net> Christopher Michael <cp.michael@samsung.com>
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael1@comcast.net>
Christopher Michael <devilhorns@comcast.net> Chris Michael <devilhorns@comcast.net>
Christopher Michael <devilhorns@comcast.net> Christopher Michael <devilhorns@comcast.net>
Christopher Michael <devilhorns@comcast.net> Christopher <devilhorns@comcast.net>
+Christopher Michael <devilhorns@comcast.net> Chris Michael <cp.michael@samsung.com>
+Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@osg.samsung.com>
+Christopher Michael <devilhorns@comcast.net> Chris Michael <cpmichael@osg.samsung.com>
+Christopher Michael <devilhorns@comcast.net> Chris Micheal <cp.michael@samsung.com>
Sebastian Dransfeld <sd@tango.flipp.net> Sebastian Dransfeld <sebastian.dransfeld@sintef.no>
Sebastian Dransfeld <sd@tango.flipp.net> sebastid <sebastid>
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <m.blumenkran@samsung.com>