Revision 542bff0...
Go back to digest for 30th June 2013Other in KDE-PIM
Merge branch 'mklapetek/refactor'
REVIEW: 111096
Conflicts:
src/CMakeLists.txt
src/contactitem.cpp
src/examples/CMakeLists.txt
src/examples/personwidget.cpp
src/ktptranslationproxy.cpp
src/ktptranslationproxy.h
src/persondata.cpp
src/personitem.cpp
src/personsmodel.cpp
src/personsmodel.h
src/personsmodelfeature.cpp
src/plugins/core/email_kpeople_plugin.desktop
src/plugins/ktp-plugin/CMakeLists.txt
src/plugins/ktp-plugin/im_persons_data_source_plugin.desktop
src/plugins/ktp-plugin/impersonsdatasource.cpp
src/plugins/ktp-plugin/impersonsdatasource.h
src/plugins/ktp-plugin/ktp_kpeople_plugin.desktop
src/resourcewatcherservice.cpp
src/tests/duplicatestest.cpp
src/widgets/CMakeLists.txt
src/widgets/abstractpersondetailswidget.cpp
src/widgets/abstractpersondetailswidget.h
src/widgets/persondetailsview.cpp
src/widgets/persondetailsview.h
File Changes
- src/contactitem.cpp
- src/duplicatesfinder.cpp
- src/personsmodel.cpp
- src/personsmodel.h
- src/resourcewatcherservice.cpp
- src/resourcewatcherservice.h
- src/examples/CMakeLists.txt
- src/tests/duplicatestest.cpp
- src/tests/duplicatestest.h
- src/widgets/persondetailsview.cpp
- src/plugins/ktp-plugin/CMakeLists.txt