diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-05-20 08:33:51 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-05-20 08:33:51 -0400 |
| commit | 54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80 (patch) | |
| tree | fc5e50da5e0823be3e58d72773efe267b553c998 /.mailmap | |
| parent | a741e0e3cb63e3e4b398c8c275fd909836ec8074 (diff) | |
| parent | 1f3f18443db5820157448515579c14efd19eea1b (diff) | |
| download | libvpx-54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80.tar libvpx-54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80.tar.gz libvpx-54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80.tar.bz2 libvpx-54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80.zip | |
Merge remote branch 'origin/master' into experimental
Conflicts:
configure
Change-Id: I91b9059e5b724a96368c7765c147fdf5a5ce03f2
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions