[libass/f13/master: 6/6] Merge branch 'f12/master' into f13/master

Martin Sourada mso at fedoraproject.org
Fri Jul 30 08:45:46 UTC 2010


commit 05f68e03176328edd26368c166bbb4e9b24e107a
Merge: 2fa7a0c ea834f5
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Fri Jul 30 10:42:22 2010 +0200

    Merge branch 'f12/master' into f13/master
    
    Conflicts:
    	libass.spec
    
    sync f12 with f13.

 libass.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---


More information about the scm-commits mailing list