[libvpx/f15: 4/4] Merge branch 'f16' into f15

Adam Jackson ajax at fedoraproject.org
Tue Aug 9 18:58:49 UTC 2011


commit b73891da632758df65aec30b421f6855e6820fc8
Merge: 80a1f03 7929946
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Aug 9 14:58:24 2011 -0400

    Merge branch 'f16' into f15
    
    Conflicts:
    	libvpx.spec
    	sources

 .gitignore                                         |    2 +
 ...-for-a-version-of-the-SPLITMV-bounds-patc.patch |   36 ----------
 libvpx-0.9.0-no-explicit-dep-on-static-lib.patch   |   11 ---
 libvpx-0.9.5-I6266aba7.patch                       |   73 --------------------
 libvpx.spec                                        |   12 ++-
 sources                                            |    2 +-
 6 files changed, 11 insertions(+), 125 deletions(-)
---


More information about the scm-commits mailing list