edgarriba a3e74ec521 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst

2014-08-05 12:59:47 +02:00

..

calib3d

Update tutorial

2014-07-31 11:47:59 +02:00

core

Extract imgcodecs module from highgui

2014-07-07 16:28:08 +04:00

definitions

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

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

features2d

AKAZE fixes, tests and tutorial

2014-07-30 18:02:08 +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

Split highgui module to videoio and highgui

2014-07-14 23:16:47 +04:00

images

Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style

2014-01-20 22:51:33 +04:00

imgproc

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

2014-03-24 19:02:16 +04:00

introduction

Split highgui module to videoio and highgui

2014-07-14 23:16:47 +04:00

ios

Split highgui module to videoio and highgui

2014-07-14 23:16:47 +04:00

ml

Extract imgcodecs module from highgui

2014-07-07 16:28:08 +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

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

2014-04-07 14:59:34 +04:00

viz

Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style

2014-01-20 22:51:33 +04:00

tutorials.rst

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

2014-04-07 14:59:34 +04:00