Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into refs/staging/dev
authorAlex Blasche <alexander.blasche@digia.com>
Thu, 6 Feb 2014 09:56:14 +0000 (10:56 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 6 Feb 2014 09:56:14 +0000 (10:56 +0100)
commit05294a8c3fbfffa858c696d7113d4144b584d412
tree5c648afee1c976881730baf74c3bdc60e0bf7324
parent8224fdc2791e0062311f71e8d616a71c2614f903
parent5685d3b02fb448e74f319de0053e97fff265483a
Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into refs/staging/dev
src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp