diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:38:39 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:39:23 +0100 |
| commit | 8b0018cb1a4dea8e74de01427d79494a68d843c6 (patch) | |
| tree | b6d8de4f486ccf0a4dc2f4c2b385d3f69db6e19e /examples/datavisualization/surface/surface.pro | |
| parent | 7722638fcd57f2e826bac61c3bf9ab2a7e190088 (diff) | |
| parent | 63b90a1d334743b63f396331434e9b12e366f9d3 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: Ie7a50a1cc66ddffe04933f77323d03941e0d7acd
Diffstat (limited to 'examples/datavisualization/surface/surface.pro')
0 files changed, 0 insertions, 0 deletions