diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-10 08:34:43 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-10 08:34:43 +0200 |
| commit | 64abfad7ef7bf477d97284c46eb8a7def90dcdc5 (patch) | |
| tree | d524e760efe8f2af408cee14d888340469adf097 /src/compositor/compositor_api/qwaylandsurface_p.h | |
| parent | 10abf9d3553003b2e82f21d58a2f3abc7c048999 (diff) | |
| parent | a694ae228ee1779b1c6ec3cae8f1178dea6d7a5d (diff) | |
Merge remote-tracking branch 'origin/5.15' into wip/cmake
Conflicts:
src/client/configure.json
src/compositor/configure.json
Change-Id: If7d6d78d38bc2b6cc1deda389960b5b0c048e922
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface_p.h')
0 files changed, 0 insertions, 0 deletions