sprice 75ed2f52f1 Merge branch 'master' of https://github.com/Itseez/opencv ...

Conflicts:
	modules/features2d/include/opencv2/features2d.hpp
	modules/features2d/src/freak.cpp
	modules/features2d/src/stardetector.cpp

2014-03-06 15:39:06 -08:00

..

doc

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-03-03 13:45:22 +04:00

include/opencv2

Merge remote-tracking branch 'original/master' into constrained-hough-lines

2014-01-31 14:27:51 -08:00

perf

ported 2.4 perf tests for matchTemplate

2014-02-20 18:11:56 +04:00

src

Merge branch 'master' of https://github.com/Itseez/opencv

2014-03-06 15:39:06 -08:00

test

Merge pull request #2391 from ilya-lavrenov:tapi_match_template

2014-03-04 18:50:14 +04:00

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00