diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:32:20 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:32:20 +0100 |
| commit | 26e4f4f2150a4753752e33d9ad526d89314abe8f (patch) | |
| tree | 2264efec384e41eaa7d4ad8ef3f5739d63f77cd1 /tests | |
| parent | 1209493113dbf8f43837ee935e705f0776aead38 (diff) | |
| parent | 85ba3b7d83aa427d6654246a6c8f84a174a83f90 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I0e3a17d947087a01ea98826c73ad190165751c04
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions