diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-09-20 08:20:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-20 08:20:47 +0200 |
| commit | 73f880d3934650de18def4eee615162d47416674 (patch) | |
| tree | 07acedd242b334aba49df57a2983c07224b6d385 /LICENSE.GPL2 | |
| parent | 6234286925153279ca259cec04429fa584187b16 (diff) | |
| parent | 0d9f43d534983411e37a9f3912de272a4a6ced64 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/makefile.h
Change-Id: I4c2deac4f6376c85f5e4fe7fb0ccc9ab9a013cd7
Diffstat (limited to 'LICENSE.GPL2')
0 files changed, 0 insertions, 0 deletions