diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 17:05:21 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 17:05:21 +0100 |
| commit | 13e88fe2b9b1680cb161a249289c3ba998f08c0c (patch) | |
| tree | 496a9d88c69b441e8c88aa0416b327faca3a1532 /dist/changes-5.3.0 | |
| parent | a2dad3ddee9c4bf274a7c6469342e4104605ceeb (diff) | |
| parent | 470ba767663e4ad9d3183fb56ee89361354dfefb (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/items/qquickitem.cpp
src/quick/items/qquicktext.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
Change-Id: I0bc5786098193c2c40b6fd8905de75d90f6ed0cf
Diffstat (limited to 'dist/changes-5.3.0')
0 files changed, 0 insertions, 0 deletions