diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:09 +0100 |
| commit | ba94889c325841c244f401f68267d0450d3ca444 (patch) | |
| tree | 7eeed972bac7aa5a8a3cc502a36ddaee387f88bb | |
| parent | a9546c1f49ad943c6a5a1706190a1522c7f4c639 (diff) | |
| parent | 68ab691b04d14c8a5582c14842246b1041436094 (diff) | |
| download | qtwebchannel-ba94889c325841c244f401f68267d0450d3ca444.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ic305f3a787440ede5bafae447a36b2e5309b6ed2
0 files changed, 0 insertions, 0 deletions