Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp

2013-09-02 19:44:51 +04:00

..

ocl

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-09-02 19:44:51 +04:00

ocl.hpp

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00