git.samba.org - metze/wireshark/wip.git/commit

author	Balint Reczey <balint@balintreczey.hu>
	Tue, 19 Dec 2023 20:16:17 +0000 (21:16 +0100)
committer	Gerald Combs <gerald@wireshark.org>
	Fri, 19 Apr 2024 22:40:18 +0000 (22:40 +0000)
commit	b64c5077a26711f935717ec37d65d34a0c99e25e
tree	6ab4da082e732949b853b067e09ca8b41adf0f95	tree
parent	6d1b32b688b0cfc937450793376727e6bd338ce0	commit \| diff

Revert "Remove version component from plugin path"

This reverts commit b52d9173f8f0201a360bc1d5ada38297a6e13553.

Resolved conflicts in:
* doc/release-notes.adoc
* packaging/nsis/logray.nsi:
   Still install cloudtrail.dll to plugin path without version as
   changed in f4e71562d09d52fccd63b1839afefdc500bfcc7a.
* ui/qt/about_dialog.cpp:
   Still capitalize "Binary plugins" as changed in 2155ef34b00b7ddb758f2cf1d1eeb4a9eaa379fc.
* wsutil/filesystem.c:
   Keep init to zero removed as changed in d0b143bbecf422db5b6f51b549726786e85a3540.

23 files changed:

CMakeLists.txt		diff \| blob \| history
WiresharkConfig.cmake.in		diff \| blob \| history
cmake/modules/WiresharkPlugin.cmake		diff \| blob \| history
cmakeconfig.h.in		diff \| blob \| history
doc/plugins.example/CMakeLists.txt		diff \| blob \| history
doc/release-notes.adoc		diff \| blob \| history
docbook/wsug_src/wsug_files.adoc		diff \| blob \| history
packaging/macosx/osx-app.sh.in		diff \| blob \| history
packaging/nsis/custom_plugins.txt		diff \| blob \| history
packaging/nsis/logray-config.nsh.in		diff \| blob \| history
packaging/nsis/logray.nsi		diff \| blob \| history
packaging/nsis/wireshark-config.nsh.in		diff \| blob \| history
packaging/nsis/wireshark.nsi		diff \| blob \| history
packaging/wix/CMakeLists.txt		diff \| blob \| history
packaging/wix/Plugins.wxi		diff \| blob \| history
resources/wireshark.pc.in		diff \| blob \| history
tshark.c		diff \| blob \| history
ui/qt/about_dialog.cpp		diff \| blob \| history
ui/qt/wireshark_main_window.cpp		diff \| blob \| history
wsutil/filesystem.c		diff \| blob \| history
wsutil/filesystem.h		diff \| blob \| history
wsutil/plugins.c		diff \| blob \| history
wsutil/plugins.h		diff \| blob \| history

Unnamed repository; edit this file to name it for gitweb.