diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:15:47 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:15:47 +0200 |
commit | 1f9b924c6735fa27adb8fdaf28fde59ee49cefdf (patch) | |
tree | 9f7f444af5de52ba68586cae93f81fef84a65748 /src/declarative/qml/qdeclarativemetatype.cpp | |
parent | 91697f5ce50604f29e4d61e921cfab60eeaf8a61 (diff) | |
parent | c56f5d8848ce03cc6667804f815de47d2d8221fb (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie3850f2b3abc07fff45c563c9a80045fdd6468bb
Diffstat (limited to 'src/declarative/qml/qdeclarativemetatype.cpp')
0 files changed, 0 insertions, 0 deletions