9b7e77ccda
Conflicts: modules/core/include/opencv2/core/version.hpp |
||
---|---|---|
.. | ||
android_lib | ||
android_test | ||
generator | ||
test | ||
build.xml.in | ||
check-tests.py | ||
CMakeLists.txt |
9b7e77ccda
Conflicts: modules/core/include/opencv2/core/version.hpp |
||
---|---|---|
.. | ||
android_lib | ||
android_test | ||
generator | ||
test | ||
build.xml.in | ||
check-tests.py | ||
CMakeLists.txt |