Commit a1796469 authored by yao's avatar yao

Merge branch 'master' of git://code.opencv.org/opencv

parents 1b6639aa 3d072dce
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment