git.ipfire.org Git - thirdparty/open-vm-tools.git/commit

]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commit

Resolve merge branch 'stable-11.3.x' conflict in 9 files.

Mirror of https://github.com/vmware/open-vm-tools.git

open-vm-tools/lib/include/vm_legal.h		diff \| blob \| blame \| history
open-vm-tools/lib/include/vm_tools_version.h		diff \| blob \| blame \| history
open-vm-tools/services/vmtoolsd/mainLoop.c		diff \| blob \| blame \| history
open-vm-tools/toolbox/l10n/zh_TW.vmsg		diff \| blob \| blame \| history
open-vm-tools/toolbox/toolbox-cmd.c		diff \| blob \| blame \| history
open-vm-tools/toolbox/toolboxCmdInt.h		diff \| blob \| blame \| history
open-vm-tools/toolbox/toolboxcmd-config.c		diff \| blob \| blame \| history
open-vm-tools/toolbox/toolboxcmd-logging.c		diff \| blob \| blame \| history
open-vm-tools/toolbox/toolboxcmd-scripts.c		diff \| blob \| blame \| history