diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-12 01:40:06 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-12 01:40:06 +0000 |
| commit | 16206348d992c23ab9fc784e3316c59b3d7e0a12 (patch) | |
| tree | 2f0d28ad5788feb4e38a8041662c0b8c69f98931 /ui | |
| parent | 687cbef1a851fe237b6242991d596b603bb205b2 (diff) | |
Move disabled_protos.{h,c} into epan.
svn path=/trunk/; revision=50521
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/main.c | 2 | ||||
| -rw-r--r-- | ui/gtk/proto_dlg.c | 2 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/wireshark_application.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index ae5e03b82c..30395d9c9c 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -85,13 +85,13 @@ #include <epan/stat_cmd_args.h> #include <epan/uat.h> #include <epan/column.h> +#include <epan/disabled_protos.h> /* general (not GTK specific) */ #include "../file.h" #include "../frame_tvbuff.h" #include "../summary.h" #include "../filters.h" -#include "../disabled_protos.h" #include "../color.h" #include "../color_filters.h" #include "../print.h" diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c index f8db18a62f..983893f3ca 100644 --- a/ui/gtk/proto_dlg.c +++ b/ui/gtk/proto_dlg.c @@ -34,9 +34,9 @@ #include <epan/prefs.h> #include <epan/filesystem.h> +#include <epan/disabled_protos.h> #include "ui/util.h" -#include "../disabled_protos.h" #include "ui/simple_dialog.h" diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 56df2fc9b9..28033ecc71 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -63,11 +63,11 @@ #include <epan/stat_cmd_args.h> #include <epan/uat.h> #include <epan/column.h> +#include <epan/disabled_protos.h> /* general (not Qt specific) */ #include "file.h" #include "summary.h" -#include "disabled_protos.h" #include "color.h" #include "color_filters.h" #include "print.h" diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index 740aad0606..76c6c6d8c3 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -25,6 +25,7 @@ #include <epan/filesystem.h> #include <epan/timestamp.h> +#include <epan/disabled_protos.h> #include "ui/recent.h" #include "ui/simple_dialog.h" @@ -33,7 +34,6 @@ #include "capture.h" #include "color_filters.h" -#include "disabled_protos.h" #include "filters.h" #include "log.h" #include "recent_file_status.h" |