summaryrefslogtreecommitdiff
path: root/translations/qt_help_sl.ts
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-03-19 15:35:45 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-03-19 15:35:45 +0100
commit20f821fc8b8d5b4091e19ef070b4979632835628 (patch)
treec14622fd2dc41d7acbf58232859c19ec41215b63 /translations/qt_help_sl.ts
parent6ccd65767806d0b03763e0a0ae5efc341fd32486 (diff)
parent1c22aa4029920619404c3162656b5749189ea6f8 (diff)
downloadqttranslations-20f821fc8b8d5b4091e19ef070b4979632835628.tar.gz
Merge branch '5.6' into 5.9v5.9.55.9.5
Conflicts: .qmake.conf translations/qtconfig_pl.ts translations/qtconfig_ru.ts Change-Id: I79eb321dac96c67e1abf7af78238ec415a3236fb
Diffstat (limited to 'translations/qt_help_sl.ts')
0 files changed, 0 insertions, 0 deletions