Alexander Alekhin ca692b9804 Merge pull request #4168 from Dikay900:export_threadcontrol		2015-07-02 11:31:16 +00:00
..
doc	Update cuda.markdown	2015-06-02 14:34:15 +01:00
include/opencv2	Merge pull request #4168 from Dikay900:export_threadcontrol	2015-07-02 11:31:16 +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 #4127 from avershov:opengl-opencl-sample	2015-07-02 11:24:10 +00:00
test	Merge pull request #4094 from kashefy:Mat_push_back_MatExpr_bug_4340	2015-07-01 09:09:51 +00:00
CMakeLists.txt	fix tests build (win,shared,world)	2015-06-05 16:30:36 +03:00