merged 2.4 into trunk

Browse Source

...

This commit is contained in:

Vadim Pisarevsky

2012-04-30 14:33:52 +00:00

parent 3f1c6d7357

commit d5a0088bbe

194 changed files with 10158 additions and 8225 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

BIN

doc/opencv_user.pdf

Binary file not shown.