GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Use Wipe composition by default (dissolve is broken for clips with alpha), and fix an issue with default value in wipe
Fixes #138

New categorization and main effects filtering

See merge request kde/kdenlive!32

Blacklisted the non-working effects

See merge request kde/kdenlive!28

Make timeline snap to clip markers

See merge request kde/kdenlive!30

Fix a typo in the RTTR target name

See merge request kde/kdenlive!31

It's 'RTTR::Core'

Fix SDL consumer not updating to correct FPS, causing very choppy audio when opening a project with an fps different than default settings