diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:39 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:39 +0100 |
| commit | 726e478bbeffb3c174d82bcd5621e917fc959fc8 (patch) | |
| tree | 98d96c73a56b32712159fc1dccdee3bc1d44a45f /src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.cpp | |
| parent | 92eac38d68165554113386e2fa989bf89f937e5c (diff) | |
| parent | 6723e2148d05e0abd2731a81213600fe2f50a3f3 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I65c8503cf632699129ebb6b4f01721b74be78def
Diffstat (limited to 'src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.cpp')
0 files changed, 0 insertions, 0 deletions