opencv/platforms
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
..
android Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +04:00
ios fix for supporting 64-bit architecture 2013-11-20 18:08:05 +04:00
linux Build fixes. Build scrips reorganized. 2013-05-28 12:27:56 +04:00
scripts Initial NativeCamera support for Android 4.4 KitKat. 2013-11-18 18:07:26 +04:00
winrt Normalized file endings. 2013-08-21 18:59:25 +04:00
readme.txt Normalized file endings. 2013-08-21 18:59:25 +04:00

This folder contains toolchains and additional files that are needed for cross compilation.
For more information see introduction tutorials for target platform in documentation:
http://docs.opencv.org/doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.html#table-of-content-introduction