#
# ChangeLog for tools/tracemerge
#
# Generated by Trac 1.0.10
# 07/03/22 20:45:35

Wed, 02 Nov 2005 00:09:23 GMT Daniel Lawson <dlawson@…> [aef91e2]
	* tools/traceanon/Makefile.am (modified)
	* tools/traceanon/traceanon.c (modified)
	* tools/tracedump/Makefile.am (modified)
	* tools/tracemerge/Makefile.am (modified)
	* tools/tracereport/Makefile.am (modified)
	* tools/tracertstats/Makefile.am (modified)
	* tools/tracesplit/Makefile.am (modified)

	updated the various Makefile.am to use include Makefile.tools


Tue, 01 Nov 2005 21:13:54 GMT Daniel Lawson <dlawson@…> [1e7434a]
	* tools/tracemerge/Makefile.am (added)
	* tools/tracereport/Makefile.am (added)
	* tools/tracertstats/Makefile.am (added)
	* tools/tracesplit/Makefile.am (added)

	adding remainder of Makefile.am for tools


Tue, 01 Nov 2005 21:08:56 GMT Daniel Lawson <dlawson@…> [a3505a8]
	* ChangeLog (modified)
	* Makefile.am (modified)
	* README (modified)
	* configure.in (modified)
	* lib/Makefile.am (modified)
	* libpacketdump/Makefile.am (modified)
	* tools/Makefile.am (added)
	* tools/traceanon/Makefile (deleted)
	* tools/traceanon/Makefile.am (added)
	* tools/tracedump/Makefile (deleted)
	* tools/tracedump/Makefile.am (added)
	* tools/tracemerge/Makefile (deleted)
	* tools/tracereport/Makefile (deleted)
	* tools/tracesplit/Makefile (deleted)

	removing old original Makefiles
	adding Makefile.am in appropriate ...


Thu, 13 Oct 2005 03:26:37 GMT Perry Lorier <perry@…> [b297e50]
	* tools/tracemerge/tracemerge.c (modified)

	Add -d to merge directions, without just does a normal merge


Wed, 12 Oct 2005 03:52:16 GMT Perry Lorier <perry@…> [801a5cc]
	* tools/tracemerge/Makefile (added)
	* tools/tracemerge/tracemerge.c (added)

	Merges two traces together