Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
authorJeff Morriss <jeff.morriss.ws@gmail.com>
Tue, 16 Jul 2013 02:35:33 +0000 (02:35 -0000)
committerJeff Morriss <jeff.morriss.ws@gmail.com>
Tue, 16 Jul 2013 02:35:33 +0000 (02:35 -0000)
commit0a669967fa719111db64437f7dd3b2869091f9e8
tree35aa1a3589fe2927087c1482683afaccb0183c89
parentd331c33b4ff4f5ce6c001a040db5ba1a0ded1c60
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.

svn path=/trunk/; revision=50656
13 files changed:
CMakeLists.txt
Makefile.common
file.c
mergecap.c
ui/gtk/capture_file_dlg.c
ui/gtk/main.c
ui/qt/QtShark.pro
ui/qt/main.cpp
ui/win32/file_dlg_win32.c
wiretap/CMakeLists.txt
wiretap/Makefile.common
wiretap/merge.c [moved from merge.c with 99% similarity]
wiretap/merge.h [moved from merge.h with 95% similarity]