diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-08-04 17:05:55 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-08-04 17:08:03 -0400 |
| commit | 56417a3075c5baa6dc8ad6f708547190458fbaa5 (patch) | |
| tree | 15f78ad9c95d11bad18354786c34683381801f7e /vp8/vp8cx.mk | |
| parent | e28e08146e468c55e435d19b2c95654e04fe3044 (diff) | |
| parent | 9eb0b2f1daf61d06b686b52915cdd46e8ee9a9ee (diff) | |
| download | libvpx-56417a3075c5baa6dc8ad6f708547190458fbaa5.tar libvpx-56417a3075c5baa6dc8ad6f708547190458fbaa5.tar.gz libvpx-56417a3075c5baa6dc8ad6f708547190458fbaa5.tar.bz2 libvpx-56417a3075c5baa6dc8ad6f708547190458fbaa5.zip | |
(Re)Merge branch 'master' into cayuga
Corrected the merge direction this time, so that running
`git describe` on the master branch finds v0.9.7 as the most recent
tag.
Change-Id: I9e7b5d473c26e670c6d9a76f5c03fa617690651d
Diffstat (limited to 'vp8/vp8cx.mk')
0 files changed, 0 insertions, 0 deletions