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

List:       kde-commits
Subject:    [gwenview] /: Merge branch 'bring-back-importer'
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2016-11-23 8:31:39
Message-ID: E1c9Sxv-0001Jm-8c () code ! kde ! org
[Download RAW message or body]

Git commit 9b67885f1c846253df392af995d714be77c417c7 by Aur=C3=A9lien G=C3=
=A2teau.
Committed on 23/11/2016 at 08:21.
Pushed by gateau into branch 'master'.

Merge branch 'bring-back-importer'

# Conflicts:
#	CMakeLists.txt

M  +2    -1    CMakeLists.txt
M  +1    -1    importer/gwenview_importer.desktop
M  +13   -13   importer/importdialog.cpp

https://commits.kde.org/gwenview/9b67885f1c846253df392af995d714be77c417c7
[prev in list] [next in list] [prev in thread] [next in thread]