summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-08-21 14:56:57 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-08-21 14:57:58 +0200
commit7561e51004e94cff4fcf2b10acfd2d1ddb2a29a3 (patch)
tree8ebac3f39cbbd225b14096efac30b1d316bfd23b /src
parentbe6a3904012d0e430cd79758da8fb535c9f970e6 (diff)
parent6a7de61bc15d0cde3a3c91c58f45ba10957aa39b (diff)
downloadqtwebchannel-7561e51004e94cff4fcf2b10acfd2d1ddb2a29a3.tar.gz
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Change-Id: Idcdb6378bb72a87af378d747e01401e5ea4e6f7f
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions