e7de55e kdenlive conflicts (#1308932), -BR: cmake

Authored and Committed by Rex Dieter 8 years ago
    kdenlive conflicts (#1308932), -BR: cmake
    
        
file modified
+0 -5
file modified
+12 -2