summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2018-02-26 13:21:09 +0200
committerKatja Marttila <katja.marttila@qt.io>2018-02-26 13:21:09 +0200
commit1ca9e90419f2dcd47ba9640110f642510055451b (patch)
tree272b4ce0b19c58a9aee00ce0da4edefa63fec39f /doc
parentfff2c98f4a7d8e4e903232b08f72aeffd5e0cda1 (diff)
parent4f1e3f8e047457d3aa7b730c4afd01dcbac61314 (diff)
Merge remote-tracking branch 'origin/3.0' into master
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions