diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:35 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:35 +0100 |
| commit | 22680333bd6748106afce258255e1201ae5493f8 (patch) | |
| tree | 106dceaa17ee7c8d4a8fca6a8c8cdd5caa106a6f | |
| parent | 95f23eece3fe3ff07120daecdaba4ea5e3b67005 (diff) | |
| parent | 71e65700cf23103d6baaf1ec07405d1269caeacf (diff) | |
| download | qttranslations-22680333bd6748106afce258255e1201ae5493f8.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I0fc53f8e4d20531211035833eebda9a7b7231c7f
0 files changed, 0 insertions, 0 deletions