You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Montel Laurent
e2c9680a40
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
agents/archivemailagent/archivejob.h
agents/archivemailagent/archivemailagentutil.cpp
agents/archivemailagent/archivemailagentutil.h
composereditor-ng/image/composerimagedialog.h
importwizard/abstractbase.cpp
importwizard/abstractbase.h
importwizard/abstractcalendar.cpp
importwizard/abstractcalendar.h
importwizard/balsa/balsaaddressbook.cpp
importwizard/balsa/balsaaddressbook.h
importwizard/balsa/balsasettings.cpp
importwizard/balsa/balsasettings.h
importwizard/claws-mail/clawsmailaddressbook.cpp
importwizard/claws-mail/clawsmailaddressbook.h
importwizard/claws-mail/clawsmailsettings.cpp
importwizard/claws-mail/clawsmailsettings.h
importwizard/evolutionv3/evolutioncalendar.cpp
importwizard/evolutionv3/evolutioncalendar.h
importwizard/evolutionv3/evolutionutil.cpp
importwizard/evolutionv3/evolutionutil.h
importwizard/importwizardutil.cpp
importwizard/importwizardutil.h
importwizard/opera/operaaddressbook.cpp
importwizard/opera/operaaddressbook.h
importwizard/opera/operasettings.h
importwizard/pmail/pmailsettings.cpp
importwizard/pmail/pmailsettings.h
importwizard/sylpheed/sylpheedsettingsutils.cpp
importwizard/sylpheed/sylpheedsettingsutils.h
importwizard/thunderbird/thunderbirdaddressbook.cpp
importwizard/thunderbird/thunderbirdaddressbook.h
importwizard/trojita/trojitasettings.cpp
importwizard/trojita/trojitasettings.h
kjots/kcm_kjots.cpp
kjots/kjotsconfigdlg.cpp
kjots/kjotsconfigdlg.h
kmail/identity/identityaddvcarddialog.cpp
kmail/identity/identityaddvcarddialog.h
kmail/identity/identityeditvcarddialog.cpp
kmail/identity/identityeditvcarddialog.h
kmail/warningwidgets/attachmentmissingwarning.cpp
kmail/warningwidgets/attachmentmissingwarning.h
mailcommon/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
mailcommon/filter/dialog/selectthunderbirdfilterfilesdialog.h
mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.cpp
mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.h
mailcommon/filter/filterimporter/filterimporterthunderbird.cpp
mailcommon/tag/addtagdialog.cpp
mailcommon/tag/addtagdialog.h
mailcommon/tag/tagwidget.cpp
mailcommon/tag/tagwidget.h
mailimporter/filterbalsa.cpp
mailimporter/filterbalsa.h
mailimporter/filterinfo.h
mailimporter/selectthunderbirdprofilewidget.cpp
mailimporter/selectthunderbirdprofilewidget.h
pimcommon/autocorrection/autocorrectionlistwidget.cpp
pimcommon/autocorrection/autocorrectionlistwidget.h
pimcommon/autocorrection/autocorrectiontreewidget.cpp
pimcommon/autocorrection/autocorrectiontreewidget.h
pimcommon/autocorrection/autocorrectionwidget.cpp
pimcommon/autocorrection/autocorrectionwidget.h
pimcommon/autocorrection/import/importabstractautocorrection.cpp
pimcommon/autocorrection/import/importabstractautocorrection.h
pimcommon/autocorrection/import/importkmailautocorrection.cpp
pimcommon/autocorrection/import/importkmailautocorrection.h
pimcommon/autocorrection/import/importlibreofficeautocorrection.cpp
pimcommon/autocorrection/import/importlibreofficeautocorrection.h
pimcommon/translator/abstracttranslator.cpp
pimcommon/translator/googletranslator.cpp
pimcommon/translator/googletranslator.h
pimcommon/translator/translatorutil.cpp
pimcommon/translator/translatorutil.h
pimcommon/util/createresource.cpp
pimcommon/util/createresource.h
pimsettingexporter/abstractimportexportjob.cpp
pimsettingexporter/abstractimportexportjob.h
pimsettingexporter/addressbook/exportaddressbookjob.cpp
pimsettingexporter/akonadidatabase.h
pimsettingexporter/alarm/exportalarmjob.cpp
pimsettingexporter/alarm/exportalarmjob.h
pimsettingexporter/alarm/importalarmjob.cpp
pimsettingexporter/alarm/importalarmjob.h
pimsettingexporter/archivestorage.cpp
pimsettingexporter/archivestorage.h
pimsettingexporter/calendar/exportcalendarjob.h
pimsettingexporter/calendar/importcalendarjob.h
pimsettingexporter/dialog/selectiontypedialog.cpp
pimsettingexporter/dialog/selectiontypedialog.h
pimsettingexporter/jot/exportjotjob.cpp
pimsettingexporter/jot/exportjotjob.h
pimsettingexporter/jot/importjotjob.cpp
pimsettingexporter/jot/importjotjob.h
pimsettingexporter/utils.cpp
plugins/messageviewer/bodypartformatter/updatecontactjob.cpp
plugins/messageviewer/bodypartformatter/vcard/updatecontactjob.h
plugins/messageviewer/bodypartformatter/vcardmemento.cpp
|
11 years ago |
| .. |
|
addemailtoexistingcontactdialog.cpp
|
Merge remote-tracking branch 'origin/KDE/4.14'
|
11 years ago |
|
addemailtoexistingcontactdialog.h
|
Merge remote-tracking branch 'origin/KDE/4.14'
|
11 years ago |
|
archivefolderdialog.cpp
|
Clean up
|
11 years ago |
|
archivefolderdialog.h
|
normalize
|
11 years ago |
|
kmknotify.cpp
|
Merge remote-tracking branch 'origin/KDE/4.14'
|
11 years ago |
|
kmknotify.h
|
Merge remote-tracking branch 'origin/KDE/4.14'
|
11 years ago |