kdeconnect-kde/kcm
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
..
CMakeLists.txt Port kcm free of KDELibs4Support 2014-09-22 09:35:40 +02:00
devicessortproxymodel.cpp Removed unused kdebugnamespace, makes kcm kDebug free 2014-09-22 00:17:56 +02:00
devicessortproxymodel.h Minor changes 2014-08-11 18:57:48 +02:00
kcm.cpp fix memleak 2014-11-10 20:36:12 +01:00
kcm.h Added a refresh button to KCM, just in case. 2014-08-11 18:57:49 +02:00
kcm.ui Added a refresh button to KCM, just in case. 2014-08-11 18:57:49 +02:00
kcm_kdeconnect.desktop Merge branch 'master' into frameworks 2015-01-20 22:44:31 -08:00
kdeconnect.desktop SVN_SILENT made messages (.desktop file) 2014-12-26 04:20:08 +00:00
Messages.sh i18n 2013-09-04 21:19:02 +02:00