a1ec247 fix conflict with oxygen-icons

Authored and Committed by rdieter 14 years ago
1 file changed. 3 lines added. 0 lines removed.
    fix conflict with oxygen-icons
    
        
file modified
+3 -0