summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-04-08 06:52:22 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-04-08 06:52:22 +0000
commit4cee9928f25926581c5bfcffeb648d89e0b232ec (patch)
treee4b3d5109b177a607c2275ed4729ea0a23e0d45c /src/plugins/platforminputcontexts
parent0d4232f53100eb04f8aa85ea2a7aee395baf337f (diff)
parent20cac3d9c9c22153e9e316daff32b6050ff6be6b (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforminputcontexts')
0 files changed, 0 insertions, 0 deletions