projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ce7a2f7
b94963d
)
Merge commit 'b94963d38' into merge-2.4
author
Roman Donchenko
<roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:39:51 +0000
(16:39 +0400)
committer
Roman Donchenko
<roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:39:51 +0000
(16:39 +0400)
Conflicts:
cmake/OpenCVGenAndroidMK.cmake
Trivial merge