From kde-commits  Wed Aug 31 21:24:56 2016
From: Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date: Wed, 31 Aug 2016 21:24:56 +0000
To: kde-commits
Subject: [kdenlive] src: Merge branch '16.08'
Message-Id: <E1bfD0C-0003TR-Aa () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=147267870518008

Git commit 86a050a772366986e533ef85ad52afd893faa41b by Jean-Baptiste Mardel=
le.
Committed on 31/08/2016 at 21:24.
Pushed by mardelle into branch 'master'.

Merge branch '16.08'

M  +6    -0    src/mainwindow.cpp
M  +17   -2    src/timeline/customtrackview.cpp

http://commits.kde.org/kdenlive/86a050a772366986e533ef85ad52afd893faa41b