[libyuv/f17: 4/4] Merge branch 'master' into f17

Peter Lemenkov peter at fedoraproject.org
Thu Jul 5 10:07:28 UTC 2012


commit 38c38f20aff292d3c0cd9e862da7d11417ac51d2
Merge: 7705616 3e25228
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Jul 5 14:07:14 2012 +0400

    Merge branch 'master' into f17
    
    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