]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
Merge branch 'stable-10.3.x'
authorOliver Kurth <okurth@vmware.com>
Fri, 13 Jul 2018 22:00:10 +0000 (15:00 -0700)
committerOliver Kurth <okurth@vmware.com>
Fri, 13 Jul 2018 22:00:10 +0000 (15:00 -0700)
1  2 
open-vm-tools/LICENSE
open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CMonitorListener.h
open-vm-tools/lib/include/guestStats.h
open-vm-tools/services/plugins/guestInfo/guestInfoInt.h
open-vm-tools/services/plugins/guestInfo/perfMonLinux.c

Simple merge