potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
edgarriba
2014-08-07 12:41:47 +02:00
parent 837f001789 d30729a816
commit 3a2cf37115
160 changed files with 1393 additions and 854 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/calib3d/test/opencl/test_stereobm.cpp
+1 -1
View File
@@ -40,7 +40,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "cvconfig.h"
#include "opencv2/ts/ocl_test.hpp"