diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-16 08:56:12 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 08:56:12 +0200 |
commit | 59b275b2842b33e6e86233261fb921747c11cc54 (patch) | |
tree | 473eea8b09f54c2bccd8782d9a785457cd4ff9f7 /src/plugins/platforminputcontexts | |
parent | 47d064e905de29153d3930dfbbe9b07cd2aa0e05 (diff) | |
parent | f242b91189e3bd0cc96dd1a2695eef0521099aea (diff) |
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Change-Id: I84acde3251893f2a7a776962b2ff970b90884b63
Diffstat (limited to 'src/plugins/platforminputcontexts')
0 files changed, 0 insertions, 0 deletions