diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-27 18:58:30 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-27 19:00:53 +0100 |
commit | 77b974742faa61e21e6e5c87ebff84e19211bea6 (patch) | |
tree | e22f0b2bde5cdf5bc9e9a5053cb2a885bbfcae11 /src/bluetooth | |
parent | 0789c35b26b85597a9fb0e03713839643d2feb41 (diff) | |
parent | 44fd56d22ebc8e49f675e3a05721b04653830775 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I7e74e90225c27cb22e51c488a6a0e563359042fe
Diffstat (limited to 'src/bluetooth')
0 files changed, 0 insertions, 0 deletions