Wireshark-commits: [Wireshark-commits] master-2.0 bfa452d: Add USBPcap 1.1.0.0-g794bf26 to Windows
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 8 Oct 2015 08:12:00 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=bfa452d25aba4c26107a9d329f80a3dec94ee504
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

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

    Add USBPcap 1.1.0.0-g794bf26 to Windows installer
    
    Change-Id: Idb88cd41436e49b7a29bd4a8e896c92d8489318d
    Reviewed-on: https://code.wireshark.org/review/10868
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 7d252d4b55e06d577f56f2169a757e81276dba7b)
    Reviewed-on: https://code.wireshark.org/review/10873
    

Actions performed:

    from  35f6478   No RCS/CVS/SVN Ids any more.
    adds  bfa452d   Add USBPcap 1.1.0.0-g794bf26 to Windows installer


Summary of changes:
 Makefile.nmake                                     |    4 ++
 config.nmake                                       |    4 +-
 .../nsis/{WinPcapPage.ini => USBPcapPage.ini}      |   14 ++---
 packaging/nsis/config.nsh.in                       |    1 +
 packaging/nsis/uninstall.nsi                       |   30 +++++++++
 packaging/nsis/wireshark.nsi                       |   66 ++++++++++++++++++++
 tools/win-setup.ps1                                |    6 +-
 7 files changed, 114 insertions(+), 11 deletions(-)
 copy packaging/nsis/{WinPcapPage.ini => USBPcapPage.ini} (58%)