Roman Donchenko
|
9c2272d520
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
|
2013-11-26 15:05:26 +04:00 |
|
Roman Donchenko
|
345bc633cc
|
Boring changes - ml.
|
2013-09-05 18:26:44 +04:00 |
|
Maria Dimashova
|
989be02562
|
fixed cpp wrappers of ML tree-based models
|
2013-08-23 18:13:10 +04:00 |
|
Andrey Kamaev
|
2b1ef95415
|
Completely separate C and C++ API of OpenCV core
|
2013-04-01 15:24:34 +04:00 |
|
Andrey Kamaev
|
75513a46dc
|
Remove all include directives for <string>
|
2013-03-22 22:14:47 +04:00 |
|
Andrey Kamaev
|
2ad7b97f1c
|
All modules (except ocl and gpu) compiles and pass tests
|
2013-03-22 22:14:26 +04:00 |
|
Andrey Kamaev
|
1ca8f33b4e
|
Merge branch '2.4'
|
2013-03-21 23:11:54 +04:00 |
|
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
2013-03-13 17:26:56 +04:00 |
|