projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8cf6bcb
9ca65ce
)
Merge ppull request #258 from asmorkalov/android_emu_fix
author
Andrey Kamaev
<andrey.kamaev@itseez.com>
Mon, 24 Dec 2012 15:25:57 +0000
(19:25 +0400)
committer
Andrey Kamaev
<andrey.kamaev@itseez.com>
Mon, 24 Dec 2012 15:25:57 +0000
(19:25 +0400)
Trivial merge