diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:58:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:58:03 +0100 |
| commit | 365bfb2ef769241e798b7c222a63ff68348d87c7 (patch) | |
| tree | 5cddc0217f1dc9cd0dcf4739eb587e7a7f80207b /.qmake.conf | |
| parent | 40e18a92fe3b704735a1fa1512f5b273dedf9102 (diff) | |
| parent | c7d1706b512649b4037421aa8f0c119efd23c93a (diff) | |
| download | qttranslations-365bfb2ef769241e798b7c222a63ff68348d87c7.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta2v5.9.0-beta1v5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I51d9dc5f0e6536e7ec76098f7b87acda7dc593f1
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions