projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
647b1dd
e2eb81b
)
Merge branch 'master' of code.opencv.org:opencv
author
Alexander Mordvintesv
<zzznah@gmail.com>
Tue, 7 Aug 2012 20:21:56 +0000
(23:21 +0300)
committer
Alexander Mordvintesv
<zzznah@gmail.com>
Tue, 7 Aug 2012 20:21:56 +0000
(23:21 +0300)
Conflicts:
samples/python2/common.py
samples/python2/feature_homography.py
samples/python2/plane_ar.py
samples/python2/plane_tracker.py
Trivial merge
projects / profile / ivi / opencv.git / commitdiff