diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:44:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:44:24 +0200 |
| commit | d357d744bf58a6148c8ed05a13496d7a8ff84d02 (patch) | |
| tree | 6cdec64af5979deaa6850186cc496c56a92c4146 /examples/wayland/custom-extension | |
| parent | 966af2d2d1b1cdaa9cc12ccbed5d3433612a35e6 (diff) | |
| parent | d9132f078bb168a9a013b97493c219596cc8c6b2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
examples/wayland/qml-compositor/qml-compositor.pro
examples/wayland/server-buffer/compositor/compositor.pro
Change-Id: Ie6fa21dfbdb71f33e0a4d29d34a824048cf00864
Diffstat (limited to 'examples/wayland/custom-extension')
0 files changed, 0 insertions, 0 deletions