wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.14'

Browse Source 
Conflicts:
	agents/sendlateragent/sendlatermanager.cpp
	kaddressbook/merge/autotests/mergecontactstest.cpp
	kaddressbook/merge/job/mergecontacts.h
	kaddressbook/merge/searchduplicate/mergecontactselectinformationtabwidget.cpp
	kaddressbook/merge/widgets/mergecontactselectlistwidget.cpp
	libkdepim/addressline/completionordereditor.cpp
	libkdepim/addressline/completionordereditor.h
	libkdepim/addressline/completionordereditor_p.h
wilder-work
Montel Laurent 11 years ago
parent 9469d551f3 92089e2f03
commit 53dc3ed5ee
1 changed files with 1 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CMakeLists.txt

1
CMakeLists.txt
Unescape View File

@ -154,6 +154,7 @@ if (KDEPIM_BUILD_DESKTOP)
set(kmailprivate_mailmerge_LIB_SRCS
mailmerge/mailmergewidget.cpp
mailmerge/attachmentlistwidget.cpp
mailmerge/mailmergedialog.cpp
)
set(kmailprivate_job_LIB_SRCS

Write Preview
Loading…
Cancel
Save