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

List:       kde-commits
Subject:    [kdepim/frameworks] /: Merge remote-tracking branch 'origin/master' into frameworks
From:       Montel Laurent <montel () kde ! org>
Date:       2014-04-29 20:28:39
Message-ID: E1WfEdr-0001yW-Gw () scm ! kde ! org
[Download RAW message or body]

Git commit 015af57d95ce1420f3e5d223b279ea76c7251e6a by Montel Laurent.
Committed on 29/04/2014 at 20:28.
Pushed by mlaurent into branch 'frameworks'.

Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	kaddressbook/merge/potentialduplicatecontactswidget.h
	kaddressbook/merge/searchduplicatecontactwizard.cpp

M  +0    -2    kaddressbook/CMakeLists.txt
M  +1    -4    kaddressbook/mainwidget.cpp
M  +2    -0    kaddressbook/merge/mergecontacts.h
M  +9    -6    knotes/notes/knote.cpp
M  +1    -1    libkdepim/addressline/addresseelineedit.cpp
M  +0    -2    libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister=
.cpp

http://commits.kde.org/kdepim/015af57d95ce1420f3e5d223b279ea76c7251e6a
[prev in list] [next in list] [prev in thread] [next in thread]