diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:17:32 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:17:32 +0200 |
| commit | e50edc952ce15f3c11f4cdfad74ec984043cb080 (patch) | |
| tree | 060893ceb61fa700053b61db8f0d8ebed462e1c3 /sync.profile | |
| parent | a7c39b36c157e08fdbca6edc97950cd08d682024 (diff) | |
| parent | 86d77a900852691267f556fbde98406a12ee4310 (diff) | |
| download | qtwebchannel-e50edc952ce15f3c11f4cdfad74ec984043cb080.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
examples/webchannel/webchannel.pro
Change-Id: Ia768202d177a24ae90358b5d88621a5fa88f9002
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions