Merge pull request #3540 from AlexanderUsentsov:good_feature
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Tue, 8 Dec 2015 08:02:27 +0000 (08:02 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Tue, 8 Dec 2015 08:02:28 +0000 (08:02 +0000)
commit878ec080c7b453b5dc0470fb4d31131493f7a281
tree8d823e4bc69d32e03d5467d8dccd61dfd73beba0
parent7172c164350523410cf278e6b4171db91fa8066f
parent9abdf39c90f29c40877cd623fef60f2f8b3f4031
Merge pull request #3540 from AlexanderUsentsov:good_feature
modules/imgproc/src/featureselect.cpp
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_func.cpp