kdenlive:Applications/17.12

Last commit made on 2018-03-19
Get this branch:
git clone -b Applications/17.12 https://git.launchpad.net/kdenlive

Branch merges

Branch information

Name:
Applications/17.12
Repository:
lp:kdenlive

Recent commits

5b5e415... by l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

b7259ad... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

5a05e9d... by Christoph Feck <email address hidden>

GIT_SILENT Upgrade KDE Applications version to 17.12.3.

af714cb... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

0c456f7... by Andrius Štikonas

Use KAboutData::setDesktopFileName instead of QGuiApplication version.

Without this icon under Wayland is not working anyway.

92b88c6... by Jean-Baptiste Mardelle

Fix compatibility with MLT >= 6.6.0

bab0ebc... by Albert Astals Cid

GIT_SILENT Upgrade KDE Applications version to 17.12.2.

02b7a19... by l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

94c420c... by Wolfgang Bauer <email address hidden>

Fix build with Qt 5.6

Q(Gui)Application::setDesktopFileName() was introduced in Qt 5.7, but
kdenlive specifies 5.6.0 as minimum version in CMakeLists.txt.

ea185df... by Jean-Baptiste Mardelle

Fix backwards seeking not stoping when reaching clip start