diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:00:17 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:00:17 +0100 |
| commit | 7c7665bbd6609d5c0ee7abd635e37c626b60802b (patch) | |
| tree | caf634b0df75f66a3812a0f839da3f0ad66d28ff /src/quick/items/qquicktext.cpp | |
| parent | 536e1cccf15963b586f3112a0654ddc0d101fa69 (diff) | |
| parent | dd1bd3b01b506a05b475514fb2ba7e387f7b17fa (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4e057bf60ac718aa359750ea417377580acbfc69
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
0 files changed, 0 insertions, 0 deletions