diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:35:33 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:35:33 +0000 |
| commit | 0a669967fa719111db64437f7dd3b2869091f9e8 (patch) | |
| tree | 35aa1a3589fe2927087c1482683afaccb0183c89 /ui/gtk/capture_file_dlg.c | |
| parent | d331c33b4ff4f5ce6c001a040db5ba1a0ded1c60 (diff) | |
| download | wireshark-0a669967fa719111db64437f7dd3b2869091f9e8.tar.gz wireshark-0a669967fa719111db64437f7dd3b2869091f9e8.tar.bz2 wireshark-0a669967fa719111db64437f7dd3b2869091f9e8.zip | |
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
svn path=/trunk/; revision=50656
Diffstat (limited to 'ui/gtk/capture_file_dlg.c')
| -rw-r--r-- | ui/gtk/capture_file_dlg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index 6d24dff82c..0c97311512 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -39,11 +39,12 @@ #include "globals.h" #include "color.h" #include "color_filters.h" -#include "merge.h" -#include "ui/util.h" #include <wsutil/file_util.h> +#include <wiretap/merge.h> + +#include "ui/util.h" #include "ui/alert_box.h" #include "ui/file_dialog.h" #include "ui/recent.h" |