Vadim Pisarevsky 5a2c5227f4 Merge pull request #798 from pengx17:master_ocl_mleak		2013-04-12 13:45:44 +04:00
..
doc	Add some documentation on ocl::convolve	2013-04-08 17:15:52 +08:00
include/opencv2	Merge pull request #785 from taka-no-me:split_c_cpp2	2013-04-09 08:53:50 +04:00
perf	Make highgui.hpp independent from C API	2013-04-08 15:47:29 +04:00
src	Merge pull request #798 from pengx17:master_ocl_mleak	2013-04-12 13:45:44 +04:00
test	Merge pull request #785 from taka-no-me:split_c_cpp2	2013-04-09 08:53:50 +04:00
CMakeLists.txt	Merge branch '2.4'	2013-04-05 21:11:59 +04:00