summaryrefslogtreecommitdiff
path: root/dist/changes-5.8.0
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-01-25 11:01:05 +0100
committerLiang Qi <liang.qi@qt.io>2017-01-25 11:01:05 +0100
commit196097bfc84d297199ea591fc19e714c88796e8e (patch)
tree44db9b8047021f358a009b1d8662e69711f6b969 /dist/changes-5.8.0
parent1cbc05a6568db5e0ff094f8e09723c607ade88af (diff)
parent87d83df5f3fa2a582385e70dc22c4a9789134f99 (diff)
downloadqtwebchannel-196097bfc84d297199ea591fc19e714c88796e8e.tar.gz
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts: .qmake.conf Change-Id: I601a28bfd7eb92d894295d7b7848b4a80dcc1d5d
Diffstat (limited to 'dist/changes-5.8.0')
0 files changed, 0 insertions, 0 deletions