projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2230455)
.mailmap: Fixup my email address
authorEdward O'Callaghan <funfunctor@folklore1984.net>
Wed, 22 Jun 2016 10:42:30 +0000 (20:42 +1000)
committerMarek Olšák <marek.olsak@amd.com>
Wed, 22 Jun 2016 22:00:46 +0000 (00:00 +0200)
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net>
.mailmap patch | blob | history

diff --git a/.mailmap b/.mailmap
index c614dec8657167da9071a90ac00f4eb2ebab77a2..9c476c3c2636ea3a355fc46a79c2a519c38150ec 100644 (file)
--- 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>