diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 11:05:44 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 11:05:44 +0200 |
commit | 1383c5e31c3eeef420e4753f9753f281d3814428 (patch) | |
tree | 7ffe9aa3af6fd37e4e89d8ef6c13213a1db2a976 /src/imports | |
parent | fe78623820c5601402ebdfedccd5085859d2cf27 (diff) | |
parent | 7b5da1d3dd561bc871e7ab4bf8644d33f60d5793 (diff) | |
download | qtwebchannel-1383c5e31c3eeef420e4753f9753f281d3814428.tar.gz |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I7616cd4cde8d4be615a566e6992233485e5c2403
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions