summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorEdward O'Callaghan <funfunctor@folklore1984.net>2016-06-22 20:42:30 +1000
committerMarek Olšák <marek.olsak@amd.com>2016-06-23 00:00:46 +0200
commitf3ae370a36c2103ce994865f5c3713377a9d0ae9 (patch)
treee4df5ce4cdb436d25dbd579e35ddf93849949d21 /.mailmap
parent22304554a2e0669d38cc5de415c84bd1cccf6a94 (diff)
.mailmap: Fixup my email address
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index c614dec865..9c476c3c26 100644
--- a/.mailmap
+++ b/.mailmap
@@ -138,6 +138,8 @@ Dmitry Cherkassov <dcherkassov@gmail.com> Dmitry Cherkasov <dcherkassov@gmail.co
Dylan Baker <dylanx.c.baker@intel.com> <baker.dylan.c@gmail.com>
+Edward O'Callaghan <funfunctor@folklore1984.net> <eocallaghan@alterapraxis.com>
+
Emeric Grange <emeric.grange@gmail.com> Emeric <emeric.grange@gmail.com>
Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.com>