diff options
author | Johann <johannkoenig@google.com> | 2019-02-04 11:46:43 -0800 |
---|---|---|
committer | Johann <johannkoenig@google.com> | 2019-02-04 11:46:43 -0800 |
commit | 3248ea0e455aa3a57e9b034d740181d216c99cfb (patch) | |
tree | c365a638ab9fc92545b502dbd75f82da3ec99126 /.mailmap | |
parent | 844ca16ab1db927e0b5aff2f41b364673514da5c (diff) | |
parent | b85ac11737430a7f600ac4efb643d4833afd7428 (diff) | |
download | libvpx-3248ea0e455aa3a57e9b034d740181d216c99cfb.tar libvpx-3248ea0e455aa3a57e9b034d740181d216c99cfb.tar.gz libvpx-3248ea0e455aa3a57e9b034d740181d216c99cfb.tar.bz2 libvpx-3248ea0e455aa3a57e9b034d740181d216c99cfb.zip |
Merge remote-tracking branch 'origin/northernshoveler' into HEAD
BUG=webm:1573
Change-Id: Ie92df3adfac44d7e9c143994ef4f69cd1a04e4b8
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -4,9 +4,12 @@ Aℓex Converse <aconverse@google.com> <alex.converse@gmail.com> Alexis Ballier <aballier@gentoo.org> <alexis.ballier@gmail.com> Alpha Lam <hclam@google.com> <hclam@chromium.org> Chris Cunningham <chcunningham@chromium.org> +Chi Yo Tsai <chiyotsai@google.com> Daniele Castagna <dcastagna@chromium.org> <dcastagna@google.com> Deb Mukherjee <debargha@google.com> +Elliott Karpilovsky <elliottk@google.com> Erik Niemeyer <erik.a.niemeyer@intel.com> <erik.a.niemeyer@gmail.com> +Fyodor Kyslov <kyslov@google.com> Guillaume Martres <gmartres@google.com> <smarter3@gmail.com> Hangyu Kuang <hkuang@google.com> Hui Su <huisu@google.com> @@ -20,6 +23,7 @@ John Koleszar <jkoleszar@google.com> Joshua Litt <joshualitt@google.com> <joshualitt@chromium.org> Marco Paniconi <marpan@google.com> Marco Paniconi <marpan@google.com> <marpan@chromium.org> +Martin Storsjö <martin@martin.st> Pascal Massimino <pascal.massimino@gmail.com> Paul Wilkins <paulwilkins@google.com> Peter Boström <pbos@chromium.org> <pbos@google.com> @@ -28,6 +32,7 @@ Peter de Rivaz <peter.derivaz@gmail.com> <peter.derivaz@argondesign.com> Ralph Giles <giles@xiph.org> <giles@entropywave.com> Ralph Giles <giles@xiph.org> <giles@mozilla.com> Ronald S. Bultje <rsbultje@gmail.com> <rbultje@google.com> +Sai Deng <sdeng@google.com> Sami Pietilä <samipietila@google.com> Shiyou Yin <yinshiyou-hf@loongson.cn> Tamar Levy <tamar.levy@intel.com> @@ -40,3 +45,4 @@ Urvang Joshi <urvang@google.com> <urvang@chromium.org> Yaowu Xu <yaowu@google.com> <adam@xuyaowu.com> Yaowu Xu <yaowu@google.com> <yaowu@xuyaowu.com> Yaowu Xu <yaowu@google.com> <Yaowu Xu> +xiwei gu <guxiwei-hf@loongson.cn> |