projects / profile / ivi / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c25d82 07c5e33)
Merge pull request #2034 from pentschev:ocl_features2d_orb_master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 27 Dec 2013 11:49:27 +0000 (15:49 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 27 Dec 2013 11:49:28 +0000 (15:49 +0400)
1  2 
modules/ocl/include/opencv2/ocl.hpp patch | diff1 | diff2 | blob | history

diff --cc modules/ocl/include/opencv2/ocl.hpp
Simple merge
Domain: Multimedia / Uncategorized;