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/qt/main.cpp | |
| 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/qt/main.cpp')
| -rw-r--r-- | ui/qt/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index ba271236a4..9f497e9803 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -44,6 +44,8 @@ #include <wsutil/u3.h> #include <wsutil/file_util.h> +#include <wiretap/merge.h> + #include <epan/epan.h> #include <epan/filesystem.h> #include <wsutil/privileges.h> @@ -79,7 +81,6 @@ #include "clopts_common.h" #include "cmdarg_err.h" #include "version_info.h" -#include "merge.h" #include "log.h" #include "ui/alert_box.h" |