Commit graph

2 commits

Author SHA1 Message Date
Albert Vaca
2b13d0825c Merge branch 'master' into frameworks
Conflicts:
	kded/CMakeLists.txt
2014-11-22 09:29:05 -08:00
Albert Vaca
d8943f03ae Added dbus activation to org.kde.kdeconnect 2014-11-22 09:26:15 -08:00
Renamed from cmake/macros.cmake (Browse further)