Fix build error caused by a merge conflict.
[aom.git] / .mailmap
blobfb82a24e34512f88d07735c7480c2a7b3c16afee
1 Adrian Grange <agrange@google.com>
2 Alexis Ballier <aballier@gentoo.org> <alexis.ballier@gmail.com>
3 Hangyu Kuang <hkuang@google.com>
4 Jim Bankoski <jimbankoski@google.com>
5 John Koleszar <jkoleszar@google.com>
6 Johann Koenig <johannkoenig@google.com>
7 Johann Koenig <johannkoenig@google.com> <johann.koenig@duck.com>
8 Johann Koenig <johannkoenig@google.com> <johannkoenig@dhcp-172-19-7-52.mtv.corp.google.com>
9 Pascal Massimino <pascal.massimino@gmail.com>
10 Sami Pietilä <samipietila@google.com>
11 Tero Rintaluoma <teror@google.com> <tero.rintaluoma@on2.com>
12 Timothy B. Terriberry <tterribe@xiph.org> Tim Terriberry <tterriberry@mozilla.com>
13 Tom Finegan <tomfinegan@google.com>
14 Ralph Giles <giles@xiph.org> <giles@entropywave.com>
15 Ralph Giles <giles@xiph.org> <giles@mozilla.com>
16 Alpha Lam <hclam@google.com> <hclam@chromium.org>
17 Deb Mukherjee <debargha@google.com>
18 Yaowu Xu <yaowu@google.com> <yaowu@xuyaowu.com>