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
..
camera_wrapper	Initial NativeCamera support for Android 4.4 KitKat.	2013-11-18 18:07:26 +04:00
include	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Switched OpenCV to a 3-component version number.	2013-11-15 19:41:53 +04:00
CMakeLists.txt	android -> plarforms/android	2013-05-27 11:10:38 +04:00