Ethereal-cvs: [Ethereal-cvs] cvs commit: ethereal merge.c Makefile.common

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: ulfl@xxxxxxxxxxxx (Ulf Lamping)
Date: Thu, 17 Jun 2004 16:53:25 -0500 (CDT)
ulfl        2004/06/17 16:53:25 CDT

  Modified files:
    .                    Makefile.common 
  Added files:
    .                    merge.c 
  Log:
  add Merge functionality to Ethereal in an experimental state.
  Copied and sligthly modified merge.c from mergecap.c
  (needs a lot of code cleanup, though)
  
  Revision  Changes    Path
  1.47      +2 -1      ethereal/Makefile.common