Make the IPv4 NRB code's comments match the IPv6 NRB code's comments.
[metze/wireshark/wip.git] / wiretap / merge.c
2016-06-01 Michael MannAdd data structures necessary to support multiple Secti...
2016-05-22 Michael MannAdd wtap_optionblock_set_option_string_format
2016-02-25 Guy HarrisClean up modelines and indentation.
2016-02-23 Michael MannMaking wiretap option blocks more generic.
2016-02-11 Guy HarrisMake file indices consistently unsigned in the merge...
2016-02-11 Michael McConvilleAvoid undefined behavior in overflow check
2015-11-23 Alexis La Gouttemerge: fix parameter 'in_files/in_count_files' not...
2015-11-11 Guy HarrisMake routines used only within wiretap/merge.c static.
2015-11-10 Guy HarrisFix typo.
2015-10-05 Peter WuAllow use of variadic macros
2015-08-21 Hadriel KaplanFix memory leaks of dumper SHB and IDB infos
2015-08-19 Hadriel KaplanPcap: wtap does not set interface timestamp precision...
2015-08-19 Hadriel KaplanAdd more debug infor for windows buildbot test suite...
2015-08-19 Hadriel KaplanTry to debug merge test suite failure on windows buildbot
2015-08-18 Hadriel KaplanImprove file merging for mergecap and wireshark
2015-08-14 Hadriel KaplanIdent the merge.c/h files by 4 spaces
2015-02-28 Guy HarrisRemove some unneeded includes of <sys/time.h>.
2015-01-03 Martin MathiesonRemove unnecessary includes from wiretap folder
2015-01-02 Bill MeierAdd "Editor modelines"; Adjust whitespace as needed.
2014-09-22 Michal LabedzkiTry to fix some buildbot warnings
2014-05-09 Guy HarrisRevert "Refactor Wiretap"
2014-05-09 Michael MannRefactor Wiretap
2014-03-04 Alexis La GoutteRemove all $Id$ from top of file
2014-02-25 Michal LabedzkiWireshark: Add option to choose format type of capture...
2013-11-09 Jakub ZawadzkiReplace wtap_nstime with nstime_t, remove wtap_nstime_t...
2013-07-16 Jeff MorrissMove merge.{h,c} into wiretap: these modules use wireta...