ffa365 Merge branch 'master' into cbi

Merged and Committed by Krzysztof Daniel 7 years ago
1 file changed. 31 lines added. 17 lines removed.
    Merge branch 'master' into cbi
    
    Conflicts:
    	eclipse.spec
    
        
file modified
+31 -17