diff options
| author | Oliver Kellogg <okellogg@users.sourceforge.net> | 2018-01-19 20:43:29 +0100 |
|---|---|---|
| committer | Oliver Kellogg <okellogg@users.sourceforge.net> | 2018-01-19 20:43:29 +0100 |
| commit | 03d17e659f4f382c02101a6ded30c76c3ebec334 (patch) | |
| tree | 3ce8113bdaa282fa325361b10b5886cf186ffb7a | |
| parent | 383454e6ee7d814cbfa3e1758f506a90f96b7d13 (diff) | |
| parent | 29a39ca0376d04d1675b1642d9a06d509bca49d2 (diff) | |
| download | ATCD-03d17e659f4f382c02101a6ded30c76c3ebec334.tar.gz | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/global.features | 2 |
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 |