Andrey Kamaev 67073daf19 Merge branch '2.4'		2013-04-05 21:11:59 +04:00
..
doc	Fix build errors	2013-03-21 18:37:34 +04:00
include/opencv2	Merge branch '2.4'	2013-03-29 19:38:35 +04:00
perf	Merge branch '2.4'	2013-03-29 19:38:35 +04:00
src	fixed warnings	2013-04-02 13:24:00 +04:00
test	Merge branch '2.4'	2013-04-05 21:11:59 +04:00
CMakeLists.txt	Move OpenCL SURF to nonfree module	2013-03-21 17:59:35 +04:00