diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-02 10:55:42 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-02 10:55:42 +0200 |
commit | 5872f02d386af63a8299047df69926493732d73f (patch) | |
tree | 98dd01de8ce2f85e9430258250dab3b2938f2cd7 /translations/qtbase_ru.ts | |
parent | abb441822b2d792eea3714a01736558a94684ec9 (diff) | |
parent | e0ee24efee5472d353accb70fa86274bc34a34db (diff) | |
download | qttranslations-5872f02d386af63a8299047df69926493732d73f.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
.qmake.conf
Change-Id: I1f526a22222a69a8f9f156216dc9ca8b26bbf73a
Diffstat (limited to 'translations/qtbase_ru.ts')
0 files changed, 0 insertions, 0 deletions