diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:16:52 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-10-02 15:33:19 +0000 |
commit | 8acf507ea4975326701f4aa8f03534044678cd82 (patch) | |
tree | 0718e8d10e6218b3429a73d8b1235f8d625888a4 /src/client/qwaylanddecorationplugin_p.h | |
parent | a826749ee76bc182a43ec7f9be1bfe8e89fa5179 (diff) | |
parent | 127e5d5a79bc6de259f1fa4ba6a069d49a8f7a43 (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/client/qwaylanddecorationplugin_p.h')
0 files changed, 0 insertions, 0 deletions