kdeconnect-kde/kcm
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 branch 'master' into frameworks 2014-07-01 23:59:38 +02:00
devicessortproxymodel.cpp Simplified debug areas so we only have one, called "kdeconnect" 2014-07-01 01:26:08 +02:00
devicessortproxymodel.h Changed generic license headers 2013-08-16 06:23:54 +02:00
kcm.cpp Merge branch 'master' into frameworks 2014-07-01 23:59:38 +02:00
kcm.h kcm: Added DevicesModel declaration to move it's definition to implementation. 2014-06-14 13:06:12 +02:00
kcm.ui Remove the browse filesystem button from KCM 2014-04-05 20:05:22 +02:00
kcm_kdeconnect.desktop SVN_SILENT made messages (.desktop file) 2014-06-04 04:19:06 +00:00
kdeconnect.desktop SVN_SILENT made messages (.desktop file) 2014-06-19 04:30:11 +00:00
Messages.sh i18n 2013-09-04 21:19:02 +02:00