diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-07 00:08:06 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-07 00:13:39 +0100 |
| commit | 8ab1765b0f9640eb410864971cb4336adc7b30ab (patch) | |
| tree | bb0ecae07f0110cabde8e38ab69b326fa1118a24 /.gitignore | |
| parent | 8bd8815fd629e34c54924a2ada41007464da22ec (diff) | |
| parent | ec029b1a4c104c2400da23d4f5f04d7f03731beb (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/compositor/compositor_api/qwaylandquickitem.cpp
Change-Id: Id2f49e8703a67daedcee66db83f006df828d9da0
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions