diff options
author | Liang Qi <liang.qi@qt.io> | 2018-11-21 19:34:18 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-21 19:34:18 +0100 |
commit | 41cba737a98b16a2767c55cda0532f38b6b6a37d (patch) | |
tree | 6434877b73e2bb61842b9a4d37853a40554a4328 /src/plugins | |
parent | 2842088cb7c2b29bab6453298fff7b1aa5b488d5 (diff) | |
parent | 46076f73337d6b0fea9a006dab2af8864571ae2c (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I909c9cfa0ce80f512de4b4986e626eae66b63afa
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions