From kde-commits  Wed Nov 23 08:31:39 2016
From: =?utf-8?b?QXVyw6lsaWVuIEfDonRlYXU=?= <agateau () kde ! org>
Date: Wed, 23 Nov 2016 08:31:39 +0000
To: kde-commits
Subject: [gwenview] /: Merge branch 'bring-back-importer'
Message-Id: <E1c9Sxv-0001Jm-8c () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=147988990800672

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