diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-08-01 21:30:19 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-08-02 07:18:10 +0000 |
| commit | ca795cad2ac5e6da84ff83213dcf9e455b39399d (patch) | |
| tree | d626cd8baa43de26fadb4c1f248837ab81d03097 /packaging/nsis | |
| parent | e369270b5c7f97547196095c4cababceb6d991d2 (diff) | |
| download | wireshark-ca795cad2ac5e6da84ff83213dcf9e455b39399d.tar.gz wireshark-ca795cad2ac5e6da84ff83213dcf9e455b39399d.tar.bz2 wireshark-ca795cad2ac5e6da84ff83213dcf9e455b39399d.zip | |
Update USBPcap to 1.2.0.2
Change-Id: I0f318cdd3644ef4eb2195bed3d0bd561dde7f6dc
Reviewed-on: https://code.wireshark.org/review/22903
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: Michael Mann <mmann78@netscape.net>
(cherry picked from commit f24c1564bd9e71176bbff781e0e38cd0e29e9fa3)
Conflicts:
tools/win-setup.ps1
Reviewed-on: https://code.wireshark.org/review/22913
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/nsis/config.nsh.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 278eedc664..72741738d6 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -66,7 +66,7 @@ set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}") set(WINPCAP_PACKAGE_VERSION ${WINPCAP_VERSION}) string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}") -set(USBPCAP_DISPLAY_VERSION "1.2.0.1") +set(USBPCAP_DISPLAY_VERSION "1.2.0.2") set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in index de0b13cbd1..ef0df8080a 100644 --- a/packaging/nsis/config.nsh.in +++ b/packaging/nsis/config.nsh.in @@ -14,7 +14,7 @@ !define WIRESHARK_LIB_DIR "@WIRESHARK_LIB_DIR@" !define WINPCAP_PACKAGE_VERSION @WINPCAP_PACKAGE_VERSION@ !define PCAP_DISPLAY_VERSION @PCAP_DISPLAY_VERSION@ -!define USBPCAP_DISPLAY_VERSION "1.2.0.1" +!define USBPCAP_DISPLAY_VERSION "1.2.0.2" !define VERSION @VERSION@ !define VERSION_MAJOR @VERSION_MAJOR@ !define VERSION_MINOR @VERSION_MINOR@ |