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/win32 | |
| parent | d331c33b4ff4f5ce6c001a040db5ba1a0ded1c60 (diff) | |
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
svn path=/trunk/; revision=50656
Diffstat (limited to 'ui/win32')
| -rw-r--r-- | ui/win32/file_dlg_win32.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index c9fa01b997..955767f156 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -40,16 +40,18 @@ #include <gtk/gtk.h> +#include "wsutil/file_util.h" +#include "wsutil/unicode-utils.h" + +#include "wiretap/merge.h" + #include "epan/filesystem.h" #include "epan/addr_resolv.h" #include "epan/prefs.h" #include "epan/print.h" -#include "wsutil/file_util.h" -#include "wsutil/unicode-utils.h" #include "color.h" #include "color_filters.h" -#include "merge.h" #include "ui/alert_box.h" #include "ui/help_url.h" |