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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=dbd3e6b3929927f972d03af007fd7e15e304cb16
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

dbd3e6b by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Update USBPcap installer packaged
    
    NSIS script modified to:
    - check for KB 3033929 presence on Windows 7 / 2008R2 (as we sign drivers with a SHA2 certificate)
    - do not delete the installation folder if not empty
    
    Bug: 11766
    Change-Id: I5c7b6378b0775bb75c1b9e58e503997176c12213
    Reviewed-on: https://code.wireshark.org/review/12546
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 6c38ec1aab82d5347451ba3a0058cd81f4218daa)
    Reviewed-on: https://code.wireshark.org/review/12562
    

Actions performed:

    from  877dba1   cmake: Fix platform introspection for inet_aton() [-Wredundant-decls]
    adds  dbd3e6b   Update USBPcap installer packaged


Summary of changes:
 Makefile.nmake               |    2 +-
 config.nmake                 |    4 ++--
 packaging/nsis/wireshark.nsi |    4 ++--
 tools/win-setup.ps1          |    8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)