diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:26:19 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:26:19 +0200 |
| commit | c010338d8f186320ad5d73e479b93b7f45f19d60 (patch) | |
| tree | e57d285c599a41db0886d90f9f5017050e51b29f | |
| parent | 9a8ddea5b8bb6590d4d82127473476f572dccf5a (diff) | |
| parent | 86e30c7294a817fd67a5724b354a8cc3f148d23f (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: I4453973e64dc6488fce35b2eccf98ead5d1006e8
0 files changed, 0 insertions, 0 deletions