diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:16:22 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:16:22 +0100 |
| commit | 1466b9792e6c61eebb767717a1298f240899e8c3 (patch) | |
| tree | e4c3706eec92bde8ad758525825a117d91a478db | |
| parent | 20c196346979032932db755b98a3e22452bb7f7e (diff) | |
| parent | ee9d746eb967a8b561b58ea51da027328f1f3d8a (diff) | |
| download | qtgraphicaleffects-1466b9792e6c61eebb767717a1298f240899e8c3.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I98d336174e4887b89e51eda825c220cb84b6dd2f
0 files changed, 0 insertions, 0 deletions