diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 23:08:05 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 23:08:05 +0100 |
commit | dd5e1ffd3e9e379574325193c8546d453c11303e (patch) | |
tree | d7aaaf3ad3098a0086ba15d768f0585fce1ab926 /.gitignore | |
parent | cf450400cad0461a0b4661d31fabd949d69ec772 (diff) | |
parent | 4d3c3a08eba8d30805f18397c98e19ab9fd40722 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/client/qwaylanddisplay_p.h
Change-Id: I602b90a055d1322af369fb7b77a68583154b660f
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions