diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-26 17:44:25 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-26 17:44:25 +0000 |
| commit | f59ea5f7690c9a01ef6f7f6508084a66c40b1dae (patch) | |
| tree | 482ee255d71f113be6c62e9ff3543fd6ebb9f12a /resources | |
| parent | Releasing progress-linux version 4.2.2-1.1~progress7.99u1. (diff) | |
| download | wireshark-f59ea5f7690c9a01ef6f7f6508084a66c40b1dae.tar.xz wireshark-f59ea5f7690c9a01ef6f7f6508084a66c40b1dae.zip | |
Merging upstream version 4.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/logray.exe.manifest.in | 9 | ||||
| -rw-r--r-- | resources/wireshark.exe.manifest.in | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/resources/logray.exe.manifest.in b/resources/logray.exe.manifest.in index 8488bdff..407861d4 100644 --- a/resources/logray.exe.manifest.in +++ b/resources/logray.exe.manifest.in @@ -33,15 +33,14 @@ <application> <!-- This should match the following: - The NTDDI_VERSION and _WIN32_WINNT parts of cmakeconfig.h.in - - The GetWindowsVersion parts of packaging\nsis\wireshark.nsi - - The VersionNT parts of packaging\wix\Prerequisites.wxi + - The WinVer parts of packaging\nsis\logray.nsi --> <!-- Windows 7 --> - <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + <!-- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> --> <!-- Windows 8 --> - <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!-- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> --> <!-- Windows 8.1 --> - <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + <!-- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> --> <!-- Windows 10 & 11 --> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> </application> diff --git a/resources/wireshark.exe.manifest.in b/resources/wireshark.exe.manifest.in index b1d932c8..8f996103 100644 --- a/resources/wireshark.exe.manifest.in +++ b/resources/wireshark.exe.manifest.in @@ -33,15 +33,15 @@ <application> <!-- This should match the following: - The NTDDI_VERSION and _WIN32_WINNT parts of cmakeconfig.h.in - - The GetWindowsVersion parts of packaging\nsis\wireshark.nsi + - The WinVer parts of packaging\nsis\wireshark.nsi - The VersionNT parts of packaging\wix\Prerequisites.wxi --> <!-- Windows 7 --> - <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + <!-- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> --> <!-- Windows 8 --> - <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!-- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> --> <!-- Windows 8.1 --> - <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + <!-- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> --> <!-- Windows 10 & 11 --> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> </application> |