ccfdfc6 Merge branch 'master' of

Merged and Committed by Krzysztof Daniel 12 years ago
1 file changed. 4 lines added. 1 lines removed.
    Merge branch 'master' of
    ssh://kdaniel@pkgs.fedoraproject.org/eclipse.git
    
    Conflicts:
    	eclipse.spec
    
        
file modified
+4 -1