diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:54 +0200 |
| commit | 5efb5dac71baf7910be0ebf5debb2b0236adf8fe (patch) | |
| tree | e01842e7e0c86c57096a49012381bd37f69dad52 /src/plugins/sensors/iio-sensor-proxy/iio-sensor-proxy.pro | |
| parent | 8bd96b78bdf3598549d9de4256af4df93781c528 (diff) | |
| parent | d8e357f75a05bce5e1286c94e2b1954f6591218e (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I4286dcb9262bf38960ff3852932012718aaa5d65
Diffstat (limited to 'src/plugins/sensors/iio-sensor-proxy/iio-sensor-proxy.pro')
0 files changed, 0 insertions, 0 deletions