[libvpx/f14: 11/11] Merge branch 'f15' into f14

Adam Jackson ajax at fedoraproject.org
Tue Aug 9 20:33:06 UTC 2011


commit fe2466dc77a6d70104483aa36a2004bd7eeb83c5
Merge: 5ef101c b73891d
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Aug 9 16:32:38 2011 -0400

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

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


More information about the scm-commits mailing list