summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorChristopher Michael <devilhorns@comcast.net>2020-03-24 16:53:03 -0400
committerChristopher Michael <devilhorns@comcast.net>2020-03-24 16:53:03 -0400
commit57a48432281d0809d40f3828c403c4d8a3762f4a (patch)
tree3f86f09ef84b172f731eb6f4bdce20f4f532d276 /.mailmap
parentedb0a9b516b1c5d93535eb6113ed67b3c8dc1bef (diff)
downloadenlightenment-57a48432281d0809d40f3828c403c4d8a3762f4a.tar.gz
Revert "enlightenment/mailmap: Remove unused email addresses"
Revert these in favor of reorder so we can keep history This reverts commit edb0a9b516b1c5d93535eb6113ed67b3c8dc1bef.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 6 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 31084fc344..354eab2bd5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,9 +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>