diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-27 14:32:48 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-27 14:32:48 +0100 |
commit | 1b7f0be6ebbabbdabeb1916578de6b453d8292d0 (patch) | |
tree | 845771f8221c6d2cdc15a56cd9b19fb8c7773131 /.qmake.conf | |
parent | ec9fe87220829f2f6f3940f714a8057c5f79e799 (diff) | |
parent | ecd2782929ff8f2a7d2889083fbbca6b2a600777 (diff) | |
download | qtsensors-1b7f0be6ebbabbdabeb1916578de6b453d8292d0.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id09708fc6096716d25f541ba55de2ada6f2d385d
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions