aboutsummaryrefslogtreecommitdiffstats
path: root/features
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2016-08-26 20:39:48 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2016-08-26 20:40:28 +0200
commit830a55ef58a21bf342eef1c2544bcbc899014e7b (patch)
treee15d5fbe038eb1c39e16b069453785c09705f328 /features
parent86f81f48c6ceed124dabddf68994dcf3c0488509 (diff)
parent48dce24717ca537a6f5d817b2f5cd689df86ad68 (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
Diffstat (limited to 'features')
0 files changed, 0 insertions, 0 deletions