summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-18 18:03:48 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-21 20:47:23 +0100
commitc3486e072ebc704f9c82c005044143b07bb88f12 (patch)
tree2524231ecedb268de745639509851654c15381ca /.qmake.conf
parentf54b179a16a2301bac828a97a86b1a3719619d17 (diff)
parentb3684346bd60983cecf2524f9f8081df514b5cb0 (diff)
downloadqttranslations-5.10.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.15.10.15.10
Conflicts: .qmake.conf translations/qtbase_fi.ts Change-Id: I3caeac23157280f25db535ae4ef846f0d46c427b
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions