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
..
declarativeplugin	Port plasmoid to Plasma Next	2014-06-18 02:35:48 +02:00
package	Merge branch 'master' into frameworks	2014-07-01 23:59:38 +02:00
CMakeLists.txt	First working implementation of notifications plasmoid	2013-08-22 03:21:08 +02:00
Messages.sh	fix broken message extraction, so ui/rc files any more	2014-02-14 17:44:12 +01:00