[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src: Merge branch '15.12'
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2015-12-23 22:18:22
Message-ID: E1aBrji-0005An-LH () scm ! kde ! org
[Download RAW message or body]

Git commit c2490369a353617a43c9fc26c2bc30adf3d6a98e by Jean-Baptiste Mardel=
le.
Committed on 23/12/2015 at 22:18.
Pushed by mardelle into branch 'master'.

Merge branch '15.12'

M  +9    -3    src/dvdwizard/dvdwizard.cpp
M  +15   -5    src/timeline/customtrackview.cpp
M  +1    -1    src/timeline/timeline.cpp
M  +2    -0    src/timeline/track.cpp
M  +17   -0    src/timeline/transitionhandler.cpp
M  +0    -2    src/titler/titlewidget.cpp

http://commits.kde.org/kdenlive/c2490369a353617a43c9fc26c2bc30adf3d6a98e

diff --cc src/titler/titlewidget.cpp
index e23776b,bc24ee9..cbd2167
--- a/src/titler/titlewidget.cpp
+++ b/src/titler/titlewidget.cpp
@@@ -310,7 -309,7 +309,6 @@@ TitleWidget::TitleWidget(const QUrl &ur
      zDown->setIconSize(iconSize);
      zTop->setIconSize(iconSize);
      zBottom->setIconSize(iconSize);
-     =

 -
      zDown->setIcon(KoIconUtils::themedIcon(QStringLiteral("kdenlive-zinde=
x-down")));
      zTop->setIcon(KoIconUtils::themedIcon(QStringLiteral("kdenlive-zindex=
-top")));
      zBottom->setIcon(KoIconUtils::themedIcon(QStringLiteral("kdenlive-zin=
dex-bottom")));
[prev in list] [next in list] [prev in thread] [next in thread]