diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:05:31 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:05:31 +0100 |
| commit | e434118f8954bab277df3cffd367f019fb5a2ab8 (patch) | |
| tree | f3bfa08042158c8ba29ca7b8537af0a566b6d01c /config.tests | |
| parent | fd3e100b9d3c75181454593e57508039d4ecdab5 (diff) | |
| parent | 3b2175c6a4311a25e12365422bec4d5d35ee996a (diff) | |
| download | qtsensors-e434118f8954bab277df3cffd367f019fb5a2ab8.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I849cef727ec7cc88f9dccf5c600cbd59de982e7c
Diffstat (limited to 'config.tests')
0 files changed, 0 insertions, 0 deletions