projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
78dc44a
e05112a
)
Merge pull request #299 from branch 'bitwangyaoyao_ocl' into 2.4
author
Andrey Kamaev
<andrey.kamaev@itseez.com>
Wed, 23 Jan 2013 10:49:36 +0000
(14:49 +0400)
committer
Andrey Kamaev
<andrey.kamaev@itseez.com>
Wed, 23 Jan 2013 10:50:29 +0000
(14:50 +0400)
Trivial merge