diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:16 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:16 +0200 |
| commit | 88f38fbd9fb3d72eedf960011e2c4f412af13965 (patch) | |
| tree | 8bf75c3f658ec8116fffb8cb3a07fecdc3b79b18 | |
| parent | c38d69ce551b670aac716b54e7bfabc671569c35 (diff) | |
| parent | fd1e3ba5841a8981b1b43e9175a4b0fb8db6bd81 (diff) | |
| download | qtscript-88f38fbd9fb3d72eedf960011e2c4f412af13965.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: I1d15c7953e54fa7ef5026dc5d21da6d19cdad992
0 files changed, 0 insertions, 0 deletions