projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d8f749d
e873554
)
Merge branch 'fix_jpg2000' into 2.4
author
Andrey Kamaev
<andrey.kamaev@itseez.com>
Mon, 28 Jan 2013 08:41:35 +0000
(12:41 +0400)
committer
Andrey Kamaev
<andrey.kamaev@itseez.com>
Mon, 28 Jan 2013 08:41:35 +0000
(12:41 +0400)
Trivial merge
projects / platform / upstream / opencv.git / commitdiff