Merge remote-tracking branch 'upstream/master' into rho

Browse Source

...

This commit is contained in:

Olexa Bilaniuk

2014-12-05 15:56:33 -05:00

parent 38e3f2c7f5 893deb4040

commit 51963f95dd

176 changed files with 15736 additions and 2133 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1456

modules/calib3d/include/opencv2/calib3d.hpp

File diff suppressed because it is too large Load Diff