summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-06-03 11:18:47 +0200
committerLiang Qi <liang.qi@qt.io>2019-06-03 11:18:47 +0200
commit293566a1841151cf0a374af7016a396c943ab96e (patch)
tree249cc992e09e208c29369830af8cce6b0456a9bf /src/imports
parent7ef21f7ed206749252fbd03f673a8588890828b1 (diff)
parentdfc0ee4975958f7144f04957b6d5856a28e99361 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions