25b4cface0
Conflicts: modules/calib3d/src/stereobm.cpp Add CV_Assert (ndisp % 8 == 0) to NEON version
Conflicts: modules/calib3d/src/stereobm.cpp Add CV_Assert (ndisp % 8 == 0) to NEON version