[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=95f8f552891ed7c43e0474ae53ada2299878518f
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

95f8f55 by Guy Harris (guy@xxxxxxxxxxxx):

    Put setargv.obj back in the list of objects for mergecap.
    
    This should enable automatic wildcard expansion and fix bug 10354.
    
    Add the usual setargv.obj comment for reordercap, which also links with
    setargv.obj.
    
    Change-Id: If9c2b4ecf490dc263d3557a1cda24849a786d299
    Fixes-Bug: 10354
    Reviewed-on: https://code.wireshark.org/review/3484
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  dbae90c   Fix Bug #10348 Different dissection results for same file. The fault is that reassembly_table_init() must be called when reloading the file - move it to an init routine and register the init routine. While there move the proto_register_opcua() routine to the end of the file to be more consistent with other dissectors. Change soft deprecated APIs
    adds  95f8f55   Put setargv.obj back in the list of objects for mergecap.


Summary of changes:
 Makefile.nmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)