projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7172c16 9abdf39)
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)
1  2 
modules/imgproc/src/featureselect.cpp patch | diff1 | diff2 | blob | history
modules/ts/include/opencv2/ts.hpp patch | diff1 | diff2 | blob | history
modules/ts/src/ts_func.cpp patch | diff1 | diff2 | blob | history

diff --cc modules/imgproc/src/featureselect.cpp
Simple merge
diff --cc modules/ts/include/opencv2/ts.hpp
Simple merge
diff --cc modules/ts/src/ts_func.cpp
Simple merge
Domain: Multimedia / Media Vision;