diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-04-07 20:26:37 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-04-09 10:45:52 +0000 |
commit | c39c365f863a1b83f16b67101d185eb0a151eb19 (patch) | |
tree | c269925cb0b2e27628481b9be5e09ebc4d52c56a /Makefile.nmake | |
parent | a8ebc3dcf541c7b5a7d7e0e315dea432dcab7279 (diff) | |
download | wireshark-c39c365f863a1b83f16b67101d185eb0a151eb19.tar.gz |
Update USBPcap installer packaged in our Windows installer and add a warning
The newer version creates a system restore point during installation
Also add an explicit note in Wireshark installer explaining that USBPcap is
experimental and some hints on how to recover in case of issue
Bug: 12316
Change-Id: Ifb15ee98bf9db843debe5878f3df8c78f846d8d0
Reviewed-on: https://code.wireshark.org/review/14854
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 910a4ac93d..9cc31a0586 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1107,7 +1107,7 @@ process_libs: !ENDIF @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ . \ - USBPcapSetup-1.1.0.0-g794bf26-1.exe \ + USBPcapSetup-1.1.0.0-g794bf26-3.exe \ "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" !IF "$(WIN_SETUP_OPT)" == "--download" @$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIB_DIR)" "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" |