diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:29:23 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:29:23 +0200 |
| commit | df0c37d80b2e3e7ef72b3fa0b8071bd0507b1cac (patch) | |
| tree | 45cdc50ff29ba77eee9d599a1557e24896d95860 | |
| parent | b7e905eaa8769c7a4e21c43f20fb995bcd19d0ba (diff) | |
| parent | b128803199bb49483a510c26d08ccd746bd79174 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: I8b2a1df69419a70a7a827e584805db9892dd7751
0 files changed, 0 insertions, 0 deletions