summaryrefslogtreecommitdiffstats
path: root/qttranslations
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-30 16:13:52 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-30 16:13:52 +0200
commit0e4688d36ea143b285e2ecf96073c83142bdfe41 (patch)
treeffbf520c764e4942af7569b1341bf86ad56d16ee /qttranslations
parent2fb27862aa760d88790b23e0eab3cd3be5341054 (diff)
parenta5b6125466344f0f9b73691b97fbc809c5ad9f7f (diff)
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts: .gitmodules Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
Diffstat (limited to 'qttranslations')
0 files changed, 0 insertions, 0 deletions