diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:50:28 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:50:28 +0200 |
| commit | febcd84c038aeb6ce09dd8c338fef815b4947777 (patch) | |
| tree | 068d4e12362dd79469e860040b969e82c449cc13 | |
| parent | 85654ad96a6ae1556292ae31392f296e90e25156 (diff) | |
| parent | 48e2f52c4b7b56d4f9e21455701f014f34855773 (diff) | |
| download | qtx11extras-febcd84c038aeb6ce09dd8c338fef815b4947777.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: I09262494f1860abdb21a33a430e8dd83d2a4627e
0 files changed, 0 insertions, 0 deletions