cc7f209 Merge branch 'master' of ssh://pkgs.fedoraproject.org/xfig

Merged and Committed by Stanislav Ochotnicky 13 years ago
1 file changed. 6 lines added. 6 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/xfig
    
    Conflicts:
    	xfig.spec
    
    Get f14 and master back together
    
        
file modified
+6 -6