projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ab84de9
7376c53
)
Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial
author
Dan
<dtmoodie>
Fri, 25 Sep 2015 12:58:53 +0000
(08:58 -0400)
committer
Dan
<dtmoodie>
Fri, 25 Sep 2015 12:58:53 +0000
(08:58 -0400)
Conflicts:
samples/cpp/tutorial_code/gpu/gpu-thrust-interop/Thrust_interop.hpp
Trivial merge
projects / platform / upstream / opencv.git / commitdiff