aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-10-11 10:31:05 +0200
committerLiang Qi <liang.qi@qt.io>2017-10-11 10:31:05 +0200
commitf63fc8ca25dba49b125f99aa3f46a72c2e7dcb94 (patch)
treed524b39c8dc65dc3f7ef0151d32ad1db3f65a791
parent388747cb1a10a206709dc36cafb2c18485a205b8 (diff)
parent26ba2cdc5dc7e268593b78dd5ebb2bf1eefce043 (diff)
Merge remote-tracking branch 'origin/5.9.2' into 5.9
Conflicts: .gitmodules Change-Id: I2a20f7682f088a6ff1dd1fdb987b0bde3844d2ce
0 files changed, 0 insertions, 0 deletions