diff options
author | Liang Qi <liang.qi@qt.io> | 2018-11-28 08:46:42 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-28 08:46:42 +0100 |
commit | 4b2ab1d0816683dd53311ecb719ac8ede0d5b327 (patch) | |
tree | cd0cf3daf7678af3b265ff62edd78cd321e90489 /LICENSE.Chromium | |
parent | bbee17d60ae390a8c2c53d429cfa552f726a6d45 (diff) | |
parent | ba816f1f5cd5ddb7f5cba32d0c9816bb439dffba (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Idf2c89bebf5e09855d764808cac487bc4b76faaa
Diffstat (limited to 'LICENSE.Chromium')
0 files changed, 0 insertions, 0 deletions