summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza@objectcomputing.com>2018-01-19 08:59:51 -0600
committerGitHub <noreply@github.com>2018-01-19 08:59:51 -0600
commit29a39ca0376d04d1675b1642d9a06d509bca49d2 (patch)
treea80acf79426d0b6ce236b6d9ebb594cbfa33fcce
parent98ccf5cd1c7065d85350195af80006969d27e6aa (diff)
parent6f09295375e7dbe65ad6087c4be02c93dd84d2ac (diff)
downloadATCD-29a39ca0376d04d1675b1642d9a06d509bca49d2.tar.gz
Merge pull request #566 from iguessthislldo/master
MPC global.features wireshark2 renamed to wireshark_cmake
-rw-r--r--ACE/bin/MakeProjectCreator/config/global.features2
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features
index 5615065d3cc..a48b4581a90 100644
--- a/ACE/bin/MakeProjectCreator/config/global.features
+++ b/ACE/bin/MakeProjectCreator/config/global.features
@@ -64,7 +64,7 @@ nddsmonitor = 0
mcpp = 0
wireshark_any = 0
wireshark = 0
-wireshark2 = 0
+wireshark_cmake = 0
old_stdstream = 0
exclude_inet = 0
inet_ssl = 0