summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts/ibus
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-12-18 13:15:38 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-12-18 13:15:38 +0000
commitd44cd5334a97f30a50295c385f855d751c187b9e (patch)
tree45f29d64ba376138c1095b5c64d9c2481d92d801 /src/plugins/platforminputcontexts/ibus
parent8b1eb5f4202fb4120a303cd2183bb96f212c5a32 (diff)
parentbeb65dcd79f8c354dab7bb4a8d08157bd9d69329 (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforminputcontexts/ibus')
0 files changed, 0 insertions, 0 deletions