diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:30:36 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:31:02 +0100 |
commit | 19e41c59771bda6e64432a6e007afe76361ae3ef (patch) | |
tree | 030b864cd3e0dcda4dab17590214434b209cd126 /src/plugins/sensors/winrt/main.cpp | |
parent | f082ef6ed0bab0fb8007790fbc08d3ab19378473 (diff) | |
parent | a6a01b612fdb162378c4c184351e7cb8e5a559a0 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1
Change-Id: I7b64e129ef941420378cda207f5fdf90efe4c463
Diffstat (limited to 'src/plugins/sensors/winrt/main.cpp')
0 files changed, 0 insertions, 0 deletions