aboutsummaryrefslogtreecommitdiffstats
path: root/epan/CMakeLists.txt
diff options
context:
space:
mode:
authorMichal Labedzki <michal.labedzki@tieto.com>2016-01-27 13:01:49 +0100
committerAnders Broman <a.broman58@gmail.com>2016-02-08 06:06:19 +0000
commitc41bf48c9eb5ad00913a537be7e31640c5175842 (patch)
treeabdd219f9e789a98706cd21fdf1598d6f3de605c /epan/CMakeLists.txt
parent9f28bce07d0502bd51963c8e777be6f588cc919d (diff)
Rename Bluetooth OBEX dissector to OBEX
For historiacal reasons OBEX protocol was implemented as "Bluetooth OBEX", that means it is OBEX + Bluetooth related stuff. However Bluetooth related stuff does not caused any issue right now, so allow to use this dissector in non-Bluetooth cases. Bug: 11724 Change-Id: Ic645308bc854602d009f254ebbfd1b703a4c6a25 Reviewed-on: https://code.wireshark.org/review/13740 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/CMakeLists.txt')
-rw-r--r--epan/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 7899fd9c1d..c8619906b3 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -453,7 +453,6 @@ set(DISSECTOR_SRC
dissectors/packet-btle_rf.c
dissectors/packet-btl2cap.c
dissectors/packet-btmcap.c
- dissectors/packet-btobex.c
dissectors/packet-btrfcomm.c
dissectors/packet-btsap.c
dissectors/packet-btsdp.c
@@ -1088,6 +1087,7 @@ set(DISSECTOR_SRC
dissectors/packet-nwmtp.c
dissectors/packet-nwp.c
dissectors/packet-oampdu.c
+ dissectors/packet-obex.c
dissectors/packet-ocfs2.c
dissectors/packet-oicq.c
dissectors/packet-oipf.c