]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
projects / thirdparty / open-vm-tools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f09855 854c0bb)
resolve conflict in ReleaseNotes.md
authorOliver Kurth <okurth@vmware.com>
Sat, 25 Feb 2017 00:27:17 +0000 (16:27 -0800)
committerOliver Kurth <okurth@vmware.com>
Sat, 25 Feb 2017 00:27:17 +0000 (16:27 -0800)

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