Commit graph

14 commits

Author SHA1 Message Date
Albert Vaca
d8a2aac952 Merge branch 'master' into frameworks 2015-03-01 21:33:47 -08:00
l10n daemon script
ffe8a0c2d6 SVN_SILENT made messages (.desktop file) 2015-02-25 04:21:00 +00:00
Albert Vaca
dcfec8c593 Merge branch 'master' into frameworks 2015-02-03 19:05:12 -08:00
l10n daemon script
93ceecf1bd SVN_SILENT made messages (.desktop file) 2015-02-01 04:01:24 +00:00
Albert Vaca
6cc6d287fc Merge branch 'master' into frameworks
Conflicts:
	cli/kdeconnect-cli.cpp
	core/filetransferjob.cpp
	core/filetransferjob.h
	interfaces/notificationsmodel.cpp
	plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.h
	plugins/sftp/sftpplugin.cpp
2015-01-20 22:44:31 -08:00
l10n daemon script
381c5a3181 SVN_SILENT made messages (.desktop file) 2015-01-13 04:48:51 +00:00
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
l10n daemon script
d4382eec31 SVN_SILENT made messages (.desktop file) 2015-01-09 04:19:56 +00:00
l10n daemon script
81a2855f30 SVN_SILENT made messages (.desktop file) 2015-01-04 04:08:04 +00:00
l10n daemon script
a2b04c3f25 SVN_SILENT made messages (.desktop file) 2015-01-03 03:53:09 +00:00
l10n daemon script
73e3a1d683 SVN_SILENT made messages (.desktop file) 2015-01-02 04:06:52 +00:00
l10n daemon script
5e3b981de2 SVN_SILENT made messages (.desktop file) 2015-01-01 04:02:02 +00:00
l10n daemon script
5baab6c7a9 SVN_SILENT made messages (.desktop file) 2014-12-31 04:00:47 +00:00
Pramod Dematagoda
0779377337 Added a plugin to inhibit the screensaver when a device is connected.
The inhibition is lifted when the plugin disconnects.

REVIEW: 121692
2014-12-29 23:31:25 -08:00