projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a032d94 0966e5f)
Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
authorMatthias Bady <aegirxx@gmail.com>
Mon, 23 Dec 2013 18:47:06 +0000 (19:47 +0100)
committerMatthias Bady <aegirxx@gmail.com>
Mon, 23 Dec 2013 18:47:06 +0000 (19:47 +0100)
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;