Albert Vaca 84bba9429f Merge branch 'master' into 1.x ... # Conflicts: # core/backends/lan/downloadjob.cpp # core/backends/lan/downloadjob.h # core/filetransferjob.cpp # core/filetransferjob.h # plugins/notifications/sendreplydialog.cpp # plugins/notifications/sendreplydialog.h # plugins/telephony/sendsmsdialog.cpp # plugins/telephony/sendsmsdialog.h		2017-09-03 22:05:54 +02:00
..
CMakeLists.txt	Fix typo in fileitemaction plugin's name	2015-11-25 17:38:58 +01:00
kdeconnectsendfile.desktop	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
Messages.sh	i18n fixes	2014-09-08 03:09:18 +02:00
sendfileitemaction.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
sendfileitemaction.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00