diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-08-21 12:36:28 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-08-21 12:42:03 +0300 |
| commit | 776c09b3307463fb3c3d8da7054439a28c2c9ad0 (patch) | |
| tree | 564619250f6a13ef822e50b43033f9fa964d1421 /src/sdk/translations/ru.ts | |
| parent | 7a01e1b682a74a937a61c4879ca195c097249594 (diff) | |
| parent | 854734dcbe6e5a6df62d995e14c5efb6976bb6e3 (diff) | |
Merge remote-tracking branch 'origin/2.0' into 3.0
Conflicts:
src/libs/installer/downloadfiletask.cpp
src/sdk/translations/ru.ts
Change-Id: Ibce8b9592c98cec5af3521f4ae6f850c2b8f45ac
Diffstat (limited to 'src/sdk/translations/ru.ts')
0 files changed, 0 insertions, 0 deletions