diff options
| author | rcombs <rcombs@rcombs.me> | 2020-03-31 04:13:08 -0500 |
|---|---|---|
| committer | rcombs <rcombs@rcombs.me> | 2020-03-31 04:14:14 -0500 |
| commit | fa164bc50e3400fbddf94bcafbfe33e2ce9ab24b (patch) | |
| tree | b62b61e920850f5956ba070e20124ebc6315c8db | |
| parent | b5a8ad5623e6fd488f3d03f5f9bdb70c5bbb9bcb (diff) | |
| download | ffmpeg-fa164bc50e3400fbddf94bcafbfe33e2ce9ab24b.tar.gz | |
mailmap: fix 3-address entries
git only supports <new> <old>, not <new> <old1> <old2>
| -rw-r--r-- | .mailmap | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -2,14 +2,17 @@ <jeebjp@gmail.com> <jan.ekstrom@aminocom.com> <sw@jkqxz.net> <mrt@jkqxz.net> <u@pkh.me> <cboesch@gopro.com> -<zhilizhao@tencent.com> <quinkblack@foxmail.com> <wantlamy@gmail.com> +<zhilizhao@tencent.com> <quinkblack@foxmail.com> +<zhilizhao@tencent.com> <wantlamy@gmail.com> <modmaker@google.com> <modmaker-at-google.com@ffmpeg.org> <stebbins@jetheaddev.com> <jstebbins@jetheaddev.com> -<barryjzhao@tencent.com> <mypopydev@gmail.com> <jun.zhao@intel.com> +<barryjzhao@tencent.com> <mypopydev@gmail.com> +<barryjzhao@tencent.com> <jun.zhao@intel.com> <josh@itanimul.li> <joshdk@obe.tv> <michael@niedermayer.cc> <michaelni@gmx.at> <linjie.fu@intel.com> <fulinjie@zju.edu.cn> -<ceffmpeg@gmail.com> <cehoyos@ag.or.at> <cehoyos@rainbow.studorg.tuwien.ac.at> +<ceffmpeg@gmail.com> <cehoyos@ag.or.at> +<ceffmpeg@gmail.com> <cehoyos@rainbow.studorg.tuwien.ac.at> <ffmpeg@gyani.pro> <gyandoshi@gmail.com> <atomnuker@gmail.com> <rpehlivanov@obe.tv> <zhong.li@intel.com> <zhongli_dev@126.com> |