diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-11-07 15:34:19 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-11-07 15:34:19 +0100 |
| commit | bad0b76e5a7ed73b685848a8fd6a3555b754a81a (patch) | |
| tree | bb08487bdfac5ce4d5f450c2640e88e1f347c64d /config.tests/wayland_scanner | |
| parent | 64abfad7ef7bf477d97284c46eb8a7def90dcdc5 (diff) | |
| parent | 8d1fedd6781babaf130486e5c7192b0ebc9fb039 (diff) | |
Merge remote-tracking branch 'origin/5.15' into wip/cmake
Conflicts:
src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
Change-Id: I6c6e05f76abcea8a315fe3ba471c4aa2139127b5
Diffstat (limited to 'config.tests/wayland_scanner')
0 files changed, 0 insertions, 0 deletions