Merge pull request #13236 from tomoaki0705:featureHighguiGetProp
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 21 Nov 2018 15:54:59 +0000 (15:54 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 21 Nov 2018 15:55:00 +0000 (15:55 +0000)

Trivial merge