diff options
| author | Jingning Han <jingning@google.com> | 2014-03-25 09:54:32 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-03-25 10:25:16 -0700 |
| commit | c4e807ae2f60eed08811bc80d0763c489c8005c9 (patch) | |
| tree | 9465fd0cbb6a2004873868d68e47ad6b22413c71 /usage.dox | |
| parent | 34a3628a459ed7489019252d3ca0f71746788a84 (diff) | |
| download | libvpx-c4e807ae2f60eed08811bc80d0763c489c8005c9.tar libvpx-c4e807ae2f60eed08811bc80d0763c489c8005c9.tar.gz libvpx-c4e807ae2f60eed08811bc80d0763c489c8005c9.tar.bz2 libvpx-c4e807ae2f60eed08811bc80d0763c489c8005c9.zip | |
Fix compiling errors due to git merge
There were a few conflicts between the new non-RD partition search
and recent clean-up patches, which were not caught by git control.
This commit fixed these issues.
Change-Id: Ieebefbd6c19d81d0d13e3c568877d5cce2ab7797
Diffstat (limited to 'usage.dox')
0 files changed, 0 insertions, 0 deletions