]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commit
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)
commitd9b1920a4580afe43db40ae9fb49ecb68c9f48d4
tree463c6f21ccb140463fc0d9ab4e6ba5e5dff73733
parent9f0985584ea9c2de580dcee5c25bddfc880a4e98
parent854c0bb374612f7e633b448ca273f970f154458b
resolve conflict in ReleaseNotes.md