diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 13:45:02 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 13:45:02 +0100 |
commit | 9cfe355b4e0b7761360728ddf1b12832f4809e26 (patch) | |
tree | d56f5fdf591d0df63c7f704a30f7f0c999d6a2a5 /examples/bluetooth/lowenergyscanner/assets | |
parent | e18fbb5794dfbc3ffb9bc98fca51fb569a67f420 (diff) | |
parent | 25c2d4793bd4a55eec6e51ccbdfece9e505b8715 (diff) |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: Ib79fe0b33b405cdf6fee87f97f6ebb86bb79d976
Diffstat (limited to 'examples/bluetooth/lowenergyscanner/assets')
0 files changed, 0 insertions, 0 deletions