Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:11:22 +0000 (17:11 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:11:22 +0000 (17:11 +0100)
commita58f38f1c1ec41d5b886cca6486bf738f71253d1
tree5db446db30677f1951b63af028ff00d96ac8b702
parent02a4f74cfefd97d88b0b1354be176a4329336004
parent36fcfe36d720fa5dd3f0a997c565fe3898da715d
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I7295292bb7d9b5fc7eba8f099f4592b70de80d11
src/bluetooth/qbluetoothservicediscoveryagent.cpp