diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:22 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:22 +0200 |
| commit | 88ba6ede3986c119d9e95804539bbe6dfbc5bf64 (patch) | |
| tree | 26e615d44f40fc5d87b9525be62189dbb530d7e9 /examples | |
| parent | 881915309098e6bfe0f2577a72eaf9b7f3fdfa8e (diff) | |
| parent | c7dc5fb9326a7d0bbaa33aba8a383e2c1699fede (diff) | |
| download | qtsensors-88ba6ede3986c119d9e95804539bbe6dfbc5bf64.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: Ic6cdc4873d153c8a7d5d233b70c50879eaf49c9c
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions