Merge branch 'ivan/fuse-support' into ivan/plasma-active-patches
author Ivan Čukić
()
committer Ivan Čukić
()
commit de4b9d9187b96656b990e45559aab8f37107d520
tree 59df1eeb5900382e142dd4baceec789311145c39
parent 1f822b192a4d17530284966e317476b20c2216e3
parent ec00a719274de15030aaa140154833c2e0eec6a6
Merge branch 'ivan/fuse-support' into ivan/plasma-active-patches
18 files changed:
kdecore/io/kmountpoint.cpp
solid/solid/CMakeLists.txt
solid/solid/backends/fuse/fusedevice.cpp [ new file with mode 0644 ]
solid/solid/backends/fuse/fusedevice.h [ new file with mode 0644 ]
solid/solid/backends/fuse/fusehandling.cpp [ new file with mode 0644 ]
solid/solid/backends/fuse/fusehandling.h [ new file with mode 0644 ]
solid/solid/backends/fuse/fusemanager.cpp [ new file with mode 0644 ]
solid/solid/backends/fuse/fusemanager.h [ new file with mode 0644 ]
solid/solid/backends/fuse/fuseservice.h [ new file with mode 0644 ]
solid/solid/backends/fuse/fusestorageaccess.cpp [ new file with mode 0644 ]
solid/solid/backends/fuse/fusestorageaccess.h [ new file with mode 0644 ]
solid/solid/backends/fuse/fusestoragedrive.cpp [ new file with mode 0644 ]
solid/solid/backends/fuse/fusestoragedrive.h [ new file with mode 0644 ]
solid/solid/backends/fuse/fusestoragevolume.cpp [ new file with mode 0644 ]
solid/solid/backends/fuse/fusestoragevolume.h [ new file with mode 0644 ]
solid/solid/backends/fuse/fusewatcher.cpp [ new file with mode 0644 ]
solid/solid/backends/fuse/fusewatcher.h [ new file with mode 0644 ]
solid/solid/managerbase.cpp