diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:59 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:59 +0200 |
| commit | 7fe7f504d239d606bd96716e9c48cea817d6de1c (patch) | |
| tree | 40fcef9f1ae3eeaec702033d0af4a69ff93f5c70 | |
| parent | c197dffefddb6d6dd2136e583b6ab28aa5f01dfa (diff) | |
| parent | 9c405716049919ddf12951e38e82ac3a541c4d3b (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: Ie73d9a90731c6e884a03d1bb64aff5571659d45d
0 files changed, 0 insertions, 0 deletions