Roman Donchenko 78be4f66f7 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	CMakeLists.txt
	modules/calib3d/src/calibration.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/clahe.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp

2013-10-28 13:38:25 +04:00

..

hello

War on Whitespace, master edition: file endings.

2013-08-27 14:23:26 +04:00

image_manipulation

Removed incorrect release of obtained colorspace. This fixes bug #3318 (updated commit for 2.4 branch)

2013-10-24 10:36:01 +02:00

table_of_content_ios

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

video_processing

Converted tabs to spaces.

2013-08-21 18:59:26 +04:00