Albert Vaca c7c1974ea9 Merge branch 'master' into frameworks ... Conflicts: core/backends/lan/lanlinkprovider.cpp plugins/ping/pingplugin.h plugins/telephony/telephonyplugin.cpp		2015-01-10 20:14:01 -08:00
..
CMakeLists.txt	Port fileitemactionplugin free of KDELibs4Support	2014-09-23 19:33:03 +02:00
kdeconnectsendfile.desktop	SVN_SILENT made messages (.desktop file)	2015-01-02 04:06:52 +00:00
Messages.sh	i18n fixes	2014-09-08 03:09:18 +02:00
sendfileitemaction.cpp	Port fileitemactionplugin free of KDELibs4Support	2014-09-23 19:33:03 +02:00
sendfileitemaction.h	Port fileitemactionplugin free of KDELibs4Support	2014-09-23 19:33:03 +02:00