Andrey Kamaev 3b364330ad Merge branch '2.4'		2013-04-12 15:35:38 +04:00
..
doc	Fix build errors	2013-03-21 18:37:34 +04:00
include/opencv2	Remove ifdef __cplusplus from nonfree headers	2013-04-12 14:37:02 +04:00
perf	moved common gpu utility functionality to gpu_private.hpp	2013-04-08 17:25:15 +04:00
src	Merge branch '2.4'	2013-04-12 15:35:38 +04:00
test	Move C API of opencv_calib3d to separate file	2013-04-11 21:00:17 +04:00
CMakeLists.txt	Remove C API from OpenCL module	2013-04-12 14:37:02 +04:00