summaryrefslogtreecommitdiffstats
path: root/framework/qmldir
diff options
context:
space:
mode:
authorMichael Bohlender <michael.bohlender@kdemail.net>2017-04-20 08:43:51 +0200
committerMichael Bohlender <michael.bohlender@kdemail.net>2017-04-20 08:43:51 +0200
commit8e2fd6ecd38195ef703143515f78ab8e7f132139 (patch)
tree9d0262cadadd64563c19b53fdf4edae457da9b12 /framework/qmldir
parentf373659e6ba28934f07ffd4a67d005f82fe59ba4 (diff)
parent41ff2e66bf4768398a6d1e5d8ae42f60a81f44a1 (diff)
downloadkube-8e2fd6ecd38195ef703143515f78ab8e7f132139.tar.gz
kube-8e2fd6ecd38195ef703143515f78ab8e7f132139.zip
Merge branch 'mbohlender/fonts' into develop
Diffstat (limited to 'framework/qmldir')
-rw-r--r--framework/qmldir2
1 files changed, 2 insertions, 0 deletions
diff --git a/framework/qmldir b/framework/qmldir
index 9f49a65f..1cc25b18 100644
--- a/framework/qmldir
+++ b/framework/qmldir
@@ -22,5 +22,7 @@ Label 1.0 Label.qml
22singleton Colors 1.0 Colors.qml 22singleton Colors 1.0 Colors.qml
23singleton Icons 1.0 Icons.qml 23singleton Icons 1.0 Icons.qml
24singleton Units 1.0 Units.qml 24singleton Units 1.0 Units.qml
25singleton Font 1.0 Font.qml
26
25 27
26plugin frameworkplugin 28plugin frameworkplugin