diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:49:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:49:07 +0200 |
| commit | 9a2a1e2f7bebad465d474efd6d363b8c1ded940f (patch) | |
| tree | 05b22df4eb329bf12cbe9d3e1ab200b40ce8ae6f | |
| parent | c7adc518ca890f3393843785d0d814a6d164399b (diff) | |
| parent | 3bea496f93a6db5c7023803c7fe037653c4302d4 (diff) | |
| download | qtscript-9a2a1e2f7bebad465d474efd6d363b8c1ded940f.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: I94c4ed4c39850dbafd400f0aa1114a217f8e8207
0 files changed, 0 insertions, 0 deletions