From 0b6adfc7d033558681165c25f59fe4e6b6b5d40f Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Thu, 18 Dec 2014 22:17:48 +0100
Subject: Add .mailmap: fix duplicate/wrong e-mail or name in commit log
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It will be reused form generate AUTHORS file

Change-Id: I43c388df34551b898f15913c2625b1996ace0cbc
Reviewed-on: https://code.wireshark.org/review/5841
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index e5670e2fa7..ba3110f6d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -727,6 +727,7 @@ MAINTAINERCLEANFILES =		\
 	ylwrap
 
 EXTRA_DIST = \
+	.mailmap		\
 	INSTALL.configure	\
 	Makefile.am.inc		\
 	Makefile.common		\
-- 
cgit v1.2.1