diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:13 +0200 |
| commit | 49fec043a9341fb26a9ca03ad98f5d8516dc2b3e (patch) | |
| tree | f95a11175418185721b7f60361967741ba6a2cc9 /src | |
| parent | c2fc926fd4cef758e15f93ff18715c3c2491aa0b (diff) | |
| parent | 2c0df39b9db801be9648141cf09a892a24f8cf42 (diff) | |
| download | qtsvg-49fec043a9341fb26a9ca03ad98f5d8516dc2b3e.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: Iafb0b9bc6f3779e9e84e8c93d454534685741d0f
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions