Merge branch 'master' into opensuse
author Marco Martin
()
committer Marco Martin
()
commit d874698e7335ef4c405f1296c2cf7cfa2ca14ad2
tree 6f6a0e9cd6871ee20548efe6e6c47ee7e7dc1de2
parent 86f1effb84906cc4db98e0f115a76254517c37d6
parent 26ca47d7621f6ee8de68037219ca2633996b1fa4
Merge branch 'master' into opensuse
CMakeLists.txt
profile.d/activeqmlimportpath.sh.cmake [ new file with mode 0755 ]
skel/plasma-device-appletsrc