Alexander Alekhin c94945f892 Merge pull request #4210 from wangyan42164:ocl_umat_convert		2015-07-27 15:05:57 +00:00
..
doc	Update cuda.markdown	2015-06-02 14:34:15 +01:00
include/opencv2	Merge pull request #4192 from avershov:opencl-opengl-buffer	2015-07-21 14:10:00 +00:00
misc/java	Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770)	2015-05-19 13:30:18 +03:00
perf	cvRound	2015-03-11 16:14:39 +03:00
src	Merge pull request #4210 from wangyan42164:ocl_umat_convert	2015-07-27 15:05:57 +00:00
test	issue 4457	2015-07-08 16:22:58 +03:00
CMakeLists.txt	fix tests build (win,shared,world)	2015-06-05 16:30:36 +03:00