]> granicus.if.org Git - libvpx/commit
Resolve conficts caused by master branch merging
authorhui su <huisu@google.com>
Fri, 6 Nov 2015 22:35:08 +0000 (14:35 -0800)
committerhui su <huisu@google.com>
Fri, 6 Nov 2015 22:35:08 +0000 (14:35 -0800)
commit707cd03658a8240187cfc74a7b0c7446de73e77a
tree685c520a692e8d045d225003f63b0257214d67bd
parent85514c40ae603d1a5ccc9843f49329d0123d2501
Resolve conficts caused by master branch merging

Change-Id: I167e241b789331572581fcb0567ebe535b4b9345
vp10/common/reconintra.c