]> granicus.if.org Git - libvpx/commit
projects / libvpx / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 27f809d) | patch
Fix build error caused by a merge conflict.
authorAlex Converse <aconverse@google.com>
Fri, 14 Feb 2014 01:02:50 +0000 (17:02 -0800)
committerAlex Converse <aconverse@google.com>
Fri, 14 Feb 2014 01:05:13 +0000 (17:05 -0800)
commit2eccbd0f4bb060c5ac3369c83bd0f02e39ad97c2
treef0e16996a15e275a1bcb0363ef14161c32596000tree | snapshot
parent27f809db914dfb2e4bc108134a8ccd46a0ce8bd0commit | diff
Fix build error caused by a merge conflict.

Commit 70d9664f removed 'int i' required by a4f30a50.

Change-Id: I4e7e14e9e8532f753e43a57b5bba4589d58e0c32
vpxdec.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.