diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:21:44 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:21:44 +0100 |
| commit | a20948b726c1e0edd70761e8e115a53ba5526a51 (patch) | |
| tree | cdcf3367f67c465f005a97dec6141e5a4e024781 /examples/quick/dialogs/systemdialogs/main.cpp | |
| parent | 3434a0d5f8cb4bb5008caec3772c4e398986196f (diff) | |
| parent | 1c54d411ad6e98c3779a412750aec8b93d587872 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/layouts/qquicklinearlayout.cpp
Change-Id: Ib24dab43c37fc0f3f6a85398766f102a1ac833c3
Diffstat (limited to 'examples/quick/dialogs/systemdialogs/main.cpp')
0 files changed, 0 insertions, 0 deletions