Merge pull request #7055 from gylns:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 18 Aug 2016 13:17:18 +0000 (13:17 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 18 Aug 2016 13:17:18 +0000 (13:17 +0000)
1  2 
modules/features2d/src/mser.cpp

Simple merge