diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-23 13:35:38 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-23 13:35:38 +0000 |
| commit | 25b99c8f488c55d5a55874eacfb16b0d1b285cb0 (patch) | |
| tree | 8eaf2f4467c29b08de192f180f0a51a8276b71e6 /tests/auto/quick/qquicktext | |
| parent | 2dbf8e01035f3979b32d82590a362a56d2429ea1 (diff) | |
| parent | 07782f48f4318a7261f1b0ddcd686b19ec812e36 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/quick/qquicktext')
0 files changed, 0 insertions, 0 deletions