projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59cab94 96f8ff2)
Merge pull request #2000 from apavlenko:license_copyright
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 18 Dec 2013 15:35:04 +0000 (19:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 18 Dec 2013 15:35:04 +0000 (19:35 +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 / Media Vision;