diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:02:22 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:02:22 +0100 |
commit | 9adda0a194e10b39ccfadb208309e91ac02c9cae (patch) | |
tree | 6c289bfa89298bb018ac406671e3d3f53397e1bf /src/bluetooth | |
parent | 00f37af66bd819a232d65e24fe120c12cddf3240 (diff) | |
parent | 6a07037765ea7c195e802472106448432a91ec78 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I41358c93240ae922f8493f6d55a5bffcfb06bc79
Diffstat (limited to 'src/bluetooth')
0 files changed, 0 insertions, 0 deletions