Commit 302fc3cb authored by Alex Blasche's avatar Alex Blasche
Browse files

Merge remote-tracking branch 'gerrit/dev' into neard

Conflicts:
	src/bluetooth/qlowenergycontroller.cpp

Change-Id: I28b116deb3fa87169432eb2d94b70894359a9057
parents a3e2b199 a3cf9d99
No related merge requests found
Showing with 52 additions and 34 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment