diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-05 10:10:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-05 10:10:36 +0200 |
| commit | 556a476144d3a322cf109e1b7adbc2619c9232a2 (patch) | |
| tree | f908ff642d4b481b8fea7970883eb0852a0baafd /.qmake.conf | |
| parent | 29825e9e552752f25e19464cffd5d62d98ce1762 (diff) | |
| parent | b925c6d82bdd0603edfa9ee160ed9aec704c7434 (diff) | |
| download | qtsensors-556a476144d3a322cf109e1b7adbc2619c9232a2.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I25aff6426b38db3baaf3f433849dfbc32ecb1777
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions