author Thomas Zimmermann <>
Tue, 14 Apr 2015 10:26:06 +0200
changeset 268899 3c624d0fe0371c82fe2e31e04ddfa4bf6955e12b
parent 268626 187de51e7fd13cd5136d4322b8395a67d46b83db
child 269111 aa696047a7790f91ddf29bea9c8eb77f4388da52
permissions -rw-r--r--
Bug 1152821: Share BluetoothCommon.h between Bluetooth v1 and v2, r=joliu This patch integrates changes from Bluetooth v1 into the shared file BluetoothCommon.h, and makes it available to both versions. The enum constant TYPE_INVALID is replaced by NUM_TYPE.

# To trigger a clobber replace ALL of the textual description below,
# giving a bug number and a one line description of why a clobber is
# required. Modifying this file will make configure check that a
# clobber has been performed before the build can continue.
# MERGE NOTE: When merging two branches that require a CLOBBER, you should
#             merge both CLOBBER descriptions, to ensure that users on
#             both branches correctly see the clobber warning.
#                  O   <-- Users coming from both parents need to Clobber
#               /     \
#          O               O
#          |               |
#          O <-- Clobber   O  <-- Clobber
# Note: The description below will be part of the error message shown to users.
# Modifying this file will now automatically clobber the buildbot machines \o/

# Are you updating CLOBBER because you think it's needed for your WebIDL
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Bug 1152821: Merge BluetoothCommon.h variants into single file