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

Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt

2014-01-27 15:28:14 +04:00

..

calib3d

Normalized file endings.

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

core

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

2013-12-03 17:35:21 +04:00

definitions

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

2013-12-16 15:02:12 +04:00

features2d

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

2013-12-03 17:35:21 +04:00

general/table_of_content_general

Normalized file endings.

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

gpu

Deleted all trailing whitespace.

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

highgui

War on Whitespace, master edition: file endings.

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

images

Merge pull request #1474 from f-morozov:for_pr

2013-10-02 11:49:54 +04:00

imgproc

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

2013-12-03 17:35:21 +04:00

introduction

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

2014-01-27 15:28:14 +04:00

ios

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

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

ml

War on Whitespace, master edition: file endings.

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

objdetect

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

2013-12-03 17:35:21 +04:00

photo

Docs updated, added InputArray, fixes for makePtr,...

2013-09-26 19:02:35 +04:00

video

fixing trailing whitespaces

2013-09-01 22:38:21 +02:00

viz

implemented showImage

2014-01-19 18:38:55 +04:00

tutorials.rst

removed TOC

2014-01-21 18:47:22 +04:00