diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-11-26 07:42:12 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-11-26 07:43:11 +0100 |
| commit | e52b9d99cb4e5a5891c4159f35edc6c53b847d52 (patch) | |
| tree | c6433c4eede0ef9d1584f345a25b97c788c70c22 /src/plugins/sensors/simulator/simulatorirproximitysensor.h | |
| parent | 5efb5dac71baf7910be0ebf5debb2b0236adf8fe (diff) | |
| parent | d8d4a5e9ac1251e82d1ec639bc3bff7e7f53c083 (diff) | |
Merge branch '5.6' into dev
Change-Id: I6799d8791b7b67b4151697b63bdb3c0f83d39392
Diffstat (limited to 'src/plugins/sensors/simulator/simulatorirproximitysensor.h')
0 files changed, 0 insertions, 0 deletions