diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 15:22:12 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 15:22:12 +0100 |
commit | 6924a8b5be31300d7b3cfc85abce621bad032de9 (patch) | |
tree | 3f84769a4ec113703a6e589ddd4222a6118124a4 /src/qml/types | |
parent | 2f83ded7f7adf8ebfd4ae0479c4cca99ffe94a4e (diff) | |
parent | a0494a2092d7512a2b0d568a21058ed77b0cea11 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id265682aa7db9be1c0b305ab3207b2c932a25a9f
Diffstat (limited to 'src/qml/types')
0 files changed, 0 insertions, 0 deletions