diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-01-29 19:03:07 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2014-01-30 09:01:09 -0800 |
| commit | 4c0a62312430eeb2b2d59d5ffab95770c4b01f1a (patch) | |
| tree | 63f3ed7d63e22eee79eeefcdc1ccabe8554a0ac4 /.gitattributes | |
| parent | 6f81942f0ed4d99fa7668dbb64f22cafcb62b189 (diff) | |
| download | libvpx-4c0a62312430eeb2b2d59d5ffab95770c4b01f1a.tar libvpx-4c0a62312430eeb2b2d59d5ffab95770c4b01f1a.tar.gz libvpx-4c0a62312430eeb2b2d59d5ffab95770c4b01f1a.tar.bz2 libvpx-4c0a62312430eeb2b2d59d5ffab95770c4b01f1a.zip | |
Fix some automerge artifacts
Some changes in 1ca1186 were mistakenly reverted by a later merge,
this commit re-instated the chanages from values to enums.
Change-Id: Ia6b01c31da584a1f612996e6432612c1295b9eaf
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions