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

List:       kde-commits
Subject:    [konqueror] /: Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings'
From:       Giorgos Tsiapaliwkas <terietor () gmail ! com>
Date:       2016-11-08 12:36:01
Message-ID: E1c45dB-0002zm-SL () code ! kde ! org
[Download RAW message or body]

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


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