Roman Donchenko 6133aeede8 Merge branch 'master' into merge-2.4 ...

Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst

2013-10-01 17:37:05 +04:00

..

bioinspired

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

calib3d

Normalized file endings.

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

core

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

definitions

Merge branch 'master' into merge-2.4

2013-10-01 17:37:05 +04:00

features2d

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +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

include viz tutorials in the main tutorials file. ignore viz samples

2013-09-17 20:17:13 +02:00

imgproc

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

2013-09-10 11:30:19 +04:00

introduction

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

ios

War on Whitespace, master edition: file endings.

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

ml

War on Whitespace, master edition: file endings.

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

objdetect

changed int -> size_t when accessing std::vector

2013-08-31 23:35:03 +10:00

video

fixing trailing whitespaces

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

viz

removed trailing spaces

2013-09-18 12:50:55 +01:00

tutorials.rst

include viz tutorials in the main tutorials file. ignore viz samples

2013-09-17 20:17:13 +02:00