diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-23 12:27:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-23 12:27:46 +0200 |
| commit | 882294edc3b142151eea2933f77ed59110222877 (patch) | |
| tree | 6f4ea2964e18412806092ed609350c7448001380 /qtgraphicaleffects | |
| parent | 10e07c78772d2ea499a66034f0e53c88c7097cc3 (diff) | |
| parent | 2e7ba38d18768d2a926bf78bf253fec71ba5fe15 (diff) | |
Merge remote-tracking branch 'origin/5.14.2' into 5.14
Conflicts:
.gitmodules
Change-Id: I950588f85d1b39ba6ce994821db9f340b72fa6d2
Diffstat (limited to 'qtgraphicaleffects')
0 files changed, 0 insertions, 0 deletions