diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:04:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:07:54 +0100 |
| commit | fcd1d9a09d22619dfae4c1d4f9911e9acce2e893 (patch) | |
| tree | cda04b283abd5ddc41f150da559ac628ff3df03d /src/x11extras/qx11info_x11.cpp | |
| parent | c12cc26b7d64aef12f6f1ccedf3273f23799e920 (diff) | |
| parent | 922a92b533edc9bbefee729a8d91b28fbe0e3945 (diff) | |
| download | qtx11extras-5.10.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
.qmake.conf
Change-Id: I99628cda14bb3747fe0964021cb6abe7a0945dea
Diffstat (limited to 'src/x11extras/qx11info_x11.cpp')
0 files changed, 0 insertions, 0 deletions