[libyuv/f16: 4/4] Merge branch 'master' into f16
Peter Lemenkov
peter at fedoraproject.org
Thu Jul 5 10:09:04 UTC 2012
commit 7fa4b1481492af33cbf5688841a7b9c180b207ca
Merge: ba641dd 3e25228
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Jul 5 14:08:51 2012 +0400
Merge branch 'master' into f16
Conflicts:
libyuv.spec
libyuv-0001-Initial-autotools-support.patch | 28 +-
libyuv-0002-Fix-paths-in-ArmCpuCaps-test.patch | 36 ++-
...p-several-tests-due-to-GCC-related-issues.patch | 330 ++++++++++++++++++++
libyuv.spec | 14 +-
sources | 2 +-
5 files changed, 378 insertions(+), 32 deletions(-)
---
More information about the scm-commits
mailing list