Merge pull request #21147 from mjmdavis:4.x
authorMichael Davis <mjmdavis@gmail.com>
Fri, 3 Dec 2021 16:40:49 +0000 (08:40 -0800)
committerGitHub <noreply@github.com>
Fri, 3 Dec 2021 16:40:49 +0000 (16:40 +0000)
commitd2f87ca76cdbe61afa14142dc7011694e01b2ae3
tree6009d6025f7a5fd2f9918efbbe41b00ae8665f08
parent4935b145394d76dbd358ce85f7bde86a84b4aab0
Merge pull request #21147 from mjmdavis:4.x

* remove tickmarks on NSSlider
modules/highgui/src/window_cocoa.mm