opencv/platforms
Roman Donchenko 4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
..
android Android Manager Version++. 2013-11-06 14:24:18 +04:00
ios Merge pull request #1234 from SpecLad:ios-plist 2013-08-23 15:43:08 +04:00
linux Build fixes. Build scrips reorganized. 2013-05-28 12:27:56 +04:00
scripts Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +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