projects / platform / upstream / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ab84de9 7376c53)
Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial
authorDan <dtmoodie>
Fri, 25 Sep 2015 12:58:53 +0000 (08:58 -0400)
committerDan <dtmoodie>
Fri, 25 Sep 2015 12:58:53 +0000 (08:58 -0400)
commit3efe131480b8ec12b3f099e859120a066a415668
tree578c722fa143013f86e457b19894b797ec60e4fbtree | snapshot
parentab84de967ef4639130485077a2613b6897033283commit | diff
parent7376c5311bd9132e53d22479d39920797a98d836commit | diff
Merge branch 'thrust_tutorial' of github.com/dtmoodie/opencv into thrust_tutorial

Conflicts:
samples/cpp/tutorial_code/gpu/gpu-thrust-interop/Thrust_interop.hpp
Domain: Multimedia / Media Vision;