Wireshark-commits: [Wireshark-commits] master dea377b: Put setargv.obj back in the list of objects

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 8 Aug 2014 00:09:06 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=dea377ba2fb8d7040746af82a63218d0d5fd6a84
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

dea377b 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: I2ceee700ae274713bf7a6d5fae0d523e9feca481
    Fixes-Bug: 10354
    Reviewed-on: https://code.wireshark.org/review/3483
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  8a34884   Update the Developer's Guide for Chocolatey's Win flex-bison.
    adds  dea377b   Put setargv.obj back in the list of objects for mergecap.


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