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

..

camera_calibration

Split highgui module to videoio and highgui

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

real_time_pose_estimation

Added help()

2014-07-30 15:23:52 +02:00

stereoBM

Extract imgcodecs module from highgui

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