summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-01 11:03:33 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-01 11:03:38 +0200
commit6260c4376e598031e467416027703bd11012621d (patch)
tree993f83d4105f228f4cb6bed1da600dc671be2ed4 /src/shared
parent45d43ca1d9c4edca378f21530f184433cc629431 (diff)
parentd8b4bef3ddff327598027c8f94a61e3d0b61a2dd (diff)
downloadqtwayland-6260c4376e598031e467416027703bd11012621d.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I75a8ddc0652f3c6f438ef98e940c9357450d29c6
Diffstat (limited to 'src/shared')
0 files changed, 0 insertions, 0 deletions