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

Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp

2013-07-22 18:38:57 +04:00

..

bioinspired

retina included in namespace bioinspired + followed suggestions made by Vadim

2013-07-14 19:28:37 +02:00

calib3d

Fix bug with indices

2013-06-14 13:12:35 +04:00

core

Minimize usages of legacy C API inside the library

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

definitions

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

2013-07-03 19:53:21 +04:00

features2d

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

general/table_of_content_general

1) Converted all images to JPG to reduce size.

2011-07-19 22:08:54 +00:00

gpu

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

2013-07-03 19:53:21 +04:00

highgui

Minimize usages of legacy C API inside the library

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

images

adding retina tutorial

2012-10-30 15:06:13 +04:00

imgproc

fix parenthesis

2013-05-22 13:57:43 +03:00

introduction

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

2013-07-22 18:38:57 +04:00

ios

Normalize whitespace in documentation and text files

2012-10-17 21:42:09 +04:00

ml

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

2013-07-03 19:53:21 +04:00

objdetect

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

video/table_of_content_video

Normalize whitespace in documentation and text files

2012-10-17 21:42:09 +04:00

tutorials.rst

updated demos and tutorial regarding the Retina class transfer to bioinspired module.

2013-06-12 22:43:36 +02:00