diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:36:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:46:00 +0100 |
| commit | 6aa97038e26bab96455b2fc3febc5d358a5e7599 (patch) | |
| tree | 0e1177bcd4b133e39fe1a439b9cfbc718942f127 /src/quicktemplates2/qquickswipedelegate.cpp | |
| parent | 225c4a724e058851c9a2b4ffe6032b6f84cfd90c (diff) | |
| parent | 6fd334e59cab4ae0cd0c587fe2f64cf302ba1f21 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
sync.profile
Change-Id: Ie87e9b6e2d976b6ed433a8d747a83cf0d27bed95
Diffstat (limited to 'src/quicktemplates2/qquickswipedelegate.cpp')
0 files changed, 0 insertions, 0 deletions