Albert Vaca a303b73238 Merge branch 'master' into frameworks ... Conflicts: cli/kdeconnect-cli.cpp core/CMakeLists.txt plasmoid/package/contents/ui/FullRepresentation.qml plugins/ping/pingplugin.cpp		2014-07-01 23:59:38 +02:00
..
CMakeLists.txt	Merge remote-tracking branch 'origin/master' into frameworks	2014-06-18 02:46:14 +02:00
kdeconnect.desktop	SVN_SILENT made messages (.desktop file)	2014-06-04 04:19:06 +00:00
kdeconnect.notifyrc	SVN_SILENT made messages (.desktop file)	2014-06-19 04:30:11 +00:00
kdeconnectd.cpp	Merge branch 'master' into frameworks	2014-07-01 23:59:38 +02:00
kded.cpp	Merge branch 'master' into frameworks	2014-07-01 23:59:38 +02:00
kded.h	Never block the kded	2014-03-03 19:58:05 +01:00
Messages.sh	Figure out Messages.sh after code refactoring	2014-06-17 18:45:47 +02:00