summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2010-10-26 13:10:59 -0700
committerCode Review <code-review@webmproject.org>2010-10-26 13:10:59 -0700
commit91d927f9b373ccf1f3f904530fbb0417f06a9429 (patch)
tree68a7d09d802e47f53102e29992e179251884db67
parent1e7c05e0b4739e5a21efe80241259d18d71b824d (diff)
parentad760b9660323e4febb27496f5fb8de86399853c (diff)
downloadlibvpx-91d927f9b373ccf1f3f904530fbb0417f06a9429.tar
libvpx-91d927f9b373ccf1f3f904530fbb0417f06a9429.tar.gz
libvpx-91d927f9b373ccf1f3f904530fbb0417f06a9429.tar.bz2
libvpx-91d927f9b373ccf1f3f904530fbb0417f06a9429.zip
Merge "Update AUTHORS"
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 6708d5aa9..110e5e143 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
# This file is automatically generated from the git commit history
# by tools/gen_authors.sh.
+Aaron Watry <awatry@gmail.com>
Adrian Grange <agrange@google.com>
Alex Converse <alex.converse@gmail.com>
Andres Mejia <mcitadel@gmail.com>
@@ -20,6 +21,7 @@ Justin Clift <justin@salasaga.org>
Justin Lebar <justin.lebar@gmail.com>
Luca Barbato <lu_zero@gentoo.org>
Makoto Kato <makoto.kt@gmail.com>
+Martin Ettl <ettl.martin78@googlemail.com>
Michael Kohler <michaelkohler@live.com>
Paul Wilkins <paulwilkins@google.com>
Pavol Rusnak <stick@gk2.sk>