2 Commits

Author	SHA1	Message	Date
Jakub Zawadzki	38edae1c71	Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec. ... After r50154 nstime_t is inside wsutil/ so wiretap don't need it's own copy. svn path=/trunk/; revision=53184	2013-11-09 10:38:02 +00:00
Jeff Morriss	0a669967fa	Move merge.{h,c} into wiretap: these modules use wiretap to merge files. ... svn path=/trunk/; revision=50656	2013-07-16 02:35:33 +00:00