diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:15:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:15:25 +0200 |
| commit | b401f4ab3e0bcbf0da781a8d78032752f11500ab (patch) | |
| tree | bc57ce0e3a14bde8c2b4bb6beabc94e34acdbbe8 /tests | |
| parent | 368adbf8e75c00712c7a30eb6b8d7a7e175e89d7 (diff) | |
| parent | e0bf79a69dcec9825f815501bff181f12e3c33ed (diff) | |
| download | qtwebchannel-b401f4ab3e0bcbf0da781a8d78032752f11500ab.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: Ia5b809f6aeaa29c6acd6f45b696da285fe06b5f2
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions