diff options
author | Katja Marttila <katja.marttila@qt.io> | 2018-02-26 13:21:09 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2018-02-26 13:21:09 +0200 |
commit | 1ca9e90419f2dcd47ba9640110f642510055451b (patch) | |
tree | 272b4ce0b19c58a9aee00ce0da4edefa63fec39f /doc | |
parent | fff2c98f4a7d8e4e903232b08f72aeffd5e0cda1 (diff) | |
parent | 4f1e3f8e047457d3aa7b730c4afd01dcbac61314 (diff) |
Merge remote-tracking branch 'origin/3.0' into master
Change-Id: Ic74ee1485204e09e2baa384468b581ba0d9c79cd
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions