diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-17 14:44:52 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-17 14:45:12 +0200 |
| commit | 267acc4587c91beafc0f8f3ea97c70801dc269f0 (patch) | |
| tree | a55e844e081b0e8d00803e5a1503dd520bd719be /README | |
| parent | fc40bf74c29a66f8af27b2fdb9d764f30814b983 (diff) | |
| parent | e417afed5835e6f9c3c6a623d778f581bc959d1c (diff) | |
| download | qtquickcontrols-267acc4587c91beafc0f8f3ea97c70801dc269f0.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/controls/Styles/Base/MenuStyle.qml
Change-Id: I95c8b4f348260b958f158ae28c0984d54af973a8
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions