projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1036ce8 acc2ca4)
Merge branch 'master' into gpu-cuda-rename
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Wed, 11 Sep 2013 05:41:23 +0000 (09:41 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Wed, 11 Sep 2013 05:41:23 +0000 (09:41 +0400)
1  2 
cmake/OpenCVModule.cmake patch | diff1 | diff2 | blob | history
modules/ocl/test/utility.cpp patch | diff1 | diff2 | blob | history

diff --cc cmake/OpenCVModule.cmake
Simple merge
diff --cc modules/ocl/test/utility.cpp
Simple merge
Domain: Multimedia / Media Vision;