[svgpart/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

Rex Dieter rdieter at fedoraproject.org
Thu Mar 8 06:55:06 UTC 2012


commit 7939c286d4264a6203d276b77a6e7630832c7f2f
Merge: 3159763 c3dd50c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:56:35 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	sources
    	svgpart.spec

 .gitignore   |    3 +--
 sources      |    2 +-
 svgpart.spec |   30 +++++++++++++++++++++++++-----
 3 files changed, 27 insertions(+), 8 deletions(-)
---


More information about the scm-commits mailing list