summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMarie Janssen <jamuraa@chromium.org>2015-05-14 15:38:49 -0700
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2015-05-20 23:16:30 +0300
commit521e00006ab4e7ff14e5001577a9c216c823b3d1 (patch)
treec48aad82a03ece54489856966c1e94ba5416d5ae /.mailmap
parent72ffc5a10191ec613d85e885fbb854ee31a4cda9 (diff)
downloadbluez-521e00006ab4e7ff14e5001577a9c216c823b3d1.tar.gz
Fix name in AUTHORS
Update Marie's name to be correct and add it to .mailmap.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index f30b72856..a7e36e303 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,3 +8,4 @@ Alok Barsode <alokbarsode@gmail.com> <alok@greatbear.(none)>
André Dieb Martins <andre.dieb@signove.com> <andre.dieb@signove.com>
Tedd Ho-Jeong An <tedd.an@intel.com> <tedd.an@intel.com>
Martin Xu <martin.xu@linux.intel.com> <martin.xu@linux.intel.com>
+Marie Janssen <jamuraa@chromium.org> <jamuraa@chromium.org>