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

List:       kde-commits
Subject:    Re: [kdenlive/Applications/15.12] src: Use mono spaced font for status bar timecode to avoid jitter
From:       Christoph Feck <cfeck () kde ! org>
Date:       2015-12-15 0:03:51
Message-ID: 201512150103.51821.cfeck () kde ! org
[Download RAW message or body]

On Monday 14 December 2015 20:36:22 Jean-Baptiste Mardelle wrote:
> Git commit 7ec5de094559a61b3784c798dcced885e9246bde by
> Jean-Baptiste Mardelle. Committed on 14/12/2015 at 19:32.
> Pushed by mardelle into branch 'Applications/15.12'.
> 
> Use mono spaced font for status bar timecode to avoid jitter
> BUG: 356661
> 
> M  +11   -0    src/mainwindow.cpp
> 
> 
http://commits.kde.org/kdenlive/7ec5de094559a61b3784c798dcced885e92
> 46bde
> 
> diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
> index c60a8b7..85773ef 100644
> --- a/src/mainwindow.cpp
> +++ b/src/mainwindow.cpp
> @@ -970,7 +970,13 @@ void MainWindow::setupActions()
>      statusBar()->addWidget(m_statusProgressBar, 0);
>      statusBar()->addPermanentWidget(toolbar);
> 
> +<<<<<<< HEAD

Can you please check for the presence of git merge markers and remove 
them? Several of the commits added some.

Christoph Feck
KDE Quality Team
[prev in list] [next in list] [prev in thread] [next in thread]