projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2494e02
478dd01
)
Merge remote-tracking branch 'upstream/master'
author
edgarriba
<edgar.riba@gmail.com>
Mon, 6 Oct 2014 21:46:30 +0000
(23:46 +0200)
committer
edgarriba
<edgar.riba@gmail.com>
Mon, 6 Oct 2014 21:46:30 +0000
(23:46 +0200)
1
2
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
Simple merge