From kde-commits  Tue Nov 08 12:36:01 2016
From: Giorgos Tsiapaliwkas <terietor () gmail ! com>
Date: Tue, 08 Nov 2016 12:36:01 +0000
To: kde-commits
Subject: [konqueror] /: Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings'
Message-Id: <E1c45dB-0002zm-SL () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=147860860307805

Git commit 0ede5f0a1cb26cde619e5d67f064766b9e326cb5 by Giorgos Tsiapaliwkas.
Committed on 02/05/2012 at 09:39.
Pushed by lueck into branch 'master'.

Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings'
Fix the git conflicts
Conflicts:
	plasma/declarativeimports/CMakeLists.txt
	plasma/declarativeimports/test/contents/ui/Gallery.qml


http://commits.kde.org/konqueror/0ede5f0a1cb26cde619e5d67f064766b9e326cb5