summaryrefslogtreecommitdiffstats
path: root/qtremoteobjects
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-03-06 19:21:59 +0100
committerLiang Qi <liang.qi@qt.io>2017-03-07 19:40:36 +0100
commitf65308d3713a49278d28281a4065c0b84b49df7c (patch)
tree80d840e43940ba2641b6eb7c22253a25253b57c6 /qtremoteobjects
parent82cea365312698b0aae777b8affaa99544b4bc05 (diff)
parentad3c5195259321ab8420df0dee1a9b14cfc4811b (diff)
Merge remote-tracking branch 'origin/5.9' into dev
This change also integrated latest dev branch of qtremoteobjects and qtwebengine. Conflicts: .gitmodules qtremoteobjects qtwebengine Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
Diffstat (limited to 'qtremoteobjects')
m---------qtremoteobjects0
1 files changed, 0 insertions, 0 deletions
diff --git a/qtremoteobjects b/qtremoteobjects
new file mode 160000
+Subproject 570ab25a1302fbd61d0d2f32da1ea8603852e3b