Skip to content

Commit 604f5e4

Browse files
committed
resloved merge conflict
1 parent 54d878d commit 604f5e4

27 files changed

+0
-4614
lines changed

modules/mcc/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

modules/mcc/include/opencv2/ccm.hpp

Lines changed: 0 additions & 520 deletions
This file was deleted.

modules/mcc/perf/perf_ccm.cpp

Lines changed: 0 additions & 41 deletions
This file was deleted.

modules/mcc/perf/perf_main.cpp

Lines changed: 0 additions & 3 deletions
This file was deleted.

modules/mcc/perf/perf_precomp.hpp

Lines changed: 0 additions & 13 deletions
This file was deleted.

modules/mcc/samples/color_correction_model.cpp

Lines changed: 0 additions & 158 deletions
This file was deleted.

0 commit comments

Comments
 (0)