diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:02:14 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:02:14 +0200 |
commit | a382762ed9692d11679d769437eba7ff2df544d1 (patch) | |
tree | d2fb36883e8523249c21fd3b28693f8606a4f9b7 /src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro | |
parent | 1df9e1896b3760b72e518f473a97050e8cf229b0 (diff) | |
parent | bb1b46a4862e0a562b8f55e3410394492bd48b1f (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I62ad84b48962fc119e4483a794406d8f4768ee32
Diffstat (limited to 'src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro')
0 files changed, 0 insertions, 0 deletions