Andrey Pavlenko 0a624ee67d Merge pull request #1901 from vpisarev:ocl_svm3		2013-12-03 11:20:26 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-19 16:21:09 +04:00
include/opencv2	Merge pull request #1824 from vpisarev:ocl_experiments5	2013-11-20 19:14:40 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-26 15:05:26 +04:00
src	Merge pull request #1882 from philippefoubert:branch_ocl_instrumentation	2013-12-02 18:55:47 +04:00
test	hopefully, now opencv_test_imgproc should pass	2013-12-02 18:27:08 +04:00
CMakeLists.txt	ocl: don't disable Undef warnings	2013-11-22 18:24:50 +04:00