tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kdeconnect-kde/interfaces
History
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
..
KDEConnect Reorganize sources 2014-06-14 15:22:40 +02:00
CMakeLists.txt Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
dbusinterfaces.cpp Reorganize sources 2014-06-14 15:22:40 +02:00
dbusinterfaces.h Reorganize sources 2014-06-14 15:22:40 +02:00
devicesmodel.cpp Port away from deprecated setRoleNames 2014-09-23 19:27:47 +02:00
devicesmodel.h Merge branch 'master' into frameworks 2015-01-20 22:44:31 -08:00
interfaces_debug.h Forgot to add this file, needed for interfaces to build 2014-09-22 00:46:54 +02:00
KDEConnectConfig.cmake.in Reorganize sources 2014-06-14 15:22:40 +02:00
modeltest.cpp qVariantCanConvert -> QVariant::canConvert 2014-09-23 19:55:07 +02:00
modeltest.h Reorganize sources 2014-06-14 15:22:40 +02:00
notificationsmodel.cpp Merge branch 'master' into frameworks 2015-01-20 22:44:31 -08:00
notificationsmodel.h Merge branch 'master' into frameworks 2015-01-20 22:44:31 -08:00