yao 3d3e9ab635 Fix the problem of haar caused by merge

2013-07-22 17:53:56 +08:00

..

ocl

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-08 18:47:38 +04:00

ocl.hpp

Fix the problem of haar caused by merge

2013-07-22 17:53:56 +08:00