diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:23:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:23:06 +0100 |
| commit | 5efb14517ac1f7c97c69924e2e42cab1f7997f9f (patch) | |
| tree | c7935687cb237a3eb88352155a9c0e0499bd4aed /tests | |
| parent | b932739133ad8276b0e60ee35c318afddc367091 (diff) | |
| parent | 649396eba96770b211ba2fc3053c53249220ca24 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I58c54028067aa0be09ec6542e9b7154396b08d0f
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions