diff options
author | Dmitry V. Levin <ldv@altlinux.org> | 2012-05-01 21:51:38 +0000 |
---|---|---|
committer | Dmitry V. Levin <ldv@altlinux.org> | 2012-05-01 21:51:38 +0000 |
commit | e263e3b8131ad9d60c0e91d1307ae16437bc2c06 (patch) | |
tree | 121ec93db3c1d66d400ae4f664675b41c915ed04 | |
parent | 823eba28cd7a0e0cedf9bb3cd4e7f3765ceb2ef8 (diff) | |
download | strace-e263e3b8131ad9d60c0e91d1307ae16437bc2c06.tar.gz strace-e263e3b8131ad9d60c0e91d1307ae16437bc2c06.tar.bz2 strace-e263e3b8131ad9d60c0e91d1307ae16437bc2c06.tar.xz |
Remove duplicate names from CREDITS
* .mailmap: Merge email addresses.
* CREDITS.in: Remove a duplicate name.
-rw-r--r-- | .mailmap | 2 | ||||
-rw-r--r-- | CREDITS.in | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,6 @@ # Map git author names and email addresses to canonical/preferred form. +<ak@linux.intel.com> <ak@suse.de> <holger@freyther.de> <zecke@selfish.org> <schwab@linux-m68k.org> <schwab@redhat.com> <schwab@linux-m68k.org> <schwab@suse.de> +<vda.linux@googlemail.com> <dvlasenk@redhat.com> @@ -19,7 +19,6 @@ strace-devel@lists.sourceforge.net mailing list. ##> Aaron Ucko ucko@vax1.rockhurst.edu Adrien Kunysz adrien@kunysz.be -Andi Kleen ak@suse.de Anton Blanchard anton@samba.org Arkadiusz Miskiewicz misiek@pld.org.pl Bai Weidong baiwd@cn.fujitsu.com |