diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-23 21:51:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-23 21:51:17 +0200 |
| commit | 15090ec53621211616c4136ab37e0332c3ae709a (patch) | |
| tree | f0e156cafd8a478547037a079f25179b2c4a44d6 /dist/packages/com.digia.enginio/meta/LICENSE.LGPL | |
| parent | 0f6e294fb8534f677a5ec75113679cfe24f559c1 (diff) | |
| parent | 5bddee78c2fe009610c982615d1d202399e464e8 (diff) | |
| download | qtenginio-15090ec53621211616c4136ab37e0332c3ae709a.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Ie164bbaaa8c78c13d75c85d0edcc2ea4d76fe738
Diffstat (limited to 'dist/packages/com.digia.enginio/meta/LICENSE.LGPL')
0 files changed, 0 insertions, 0 deletions