Browse code

mailmap: fix 3-address entries

git only supports <new> <old>, not <new> <old1> <old2>

rcombs authored on 2020/03/31 18:13:08
Showing 1 changed files
... ...
@@ -2,14 +2,17 @@
2 2
 <jeebjp@gmail.com> <jan.ekstrom@aminocom.com>
3 3
 <sw@jkqxz.net> <mrt@jkqxz.net>
4 4
 <u@pkh.me> <cboesch@gopro.com>
5
-<zhilizhao@tencent.com> <quinkblack@foxmail.com> <wantlamy@gmail.com>
5
+<zhilizhao@tencent.com> <quinkblack@foxmail.com>
6
+<zhilizhao@tencent.com> <wantlamy@gmail.com>
6 7
 <modmaker@google.com> <modmaker-at-google.com@ffmpeg.org>
7 8
 <stebbins@jetheaddev.com> <jstebbins@jetheaddev.com>
8
-<barryjzhao@tencent.com> <mypopydev@gmail.com> <jun.zhao@intel.com>
9
+<barryjzhao@tencent.com> <mypopydev@gmail.com>
10
+<barryjzhao@tencent.com> <jun.zhao@intel.com>
9 11
 <josh@itanimul.li> <joshdk@obe.tv>
10 12
 <michael@niedermayer.cc> <michaelni@gmx.at>
11 13
 <linjie.fu@intel.com> <fulinjie@zju.edu.cn>
12
-<ceffmpeg@gmail.com> <cehoyos@ag.or.at> <cehoyos@rainbow.studorg.tuwien.ac.at>
14
+<ceffmpeg@gmail.com> <cehoyos@ag.or.at>
15
+<ceffmpeg@gmail.com> <cehoyos@rainbow.studorg.tuwien.ac.at>
13 16
 <ffmpeg@gyani.pro> <gyandoshi@gmail.com>
14 17
 <atomnuker@gmail.com> <rpehlivanov@obe.tv>
15 18
 <zhong.li@intel.com> <zhongli_dev@126.com>