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
..
doc	Merge remote-tracking branch 'upstream/master'	2014-08-05 12:59:47 +02:00
include/opencv2	Merge remote-tracking branch 'upstream/master'	2014-08-05 12:59:47 +02:00
perf	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00
src	Merge remote-tracking branch 'upstream/master'	2014-08-05 12:59:47 +02:00
test	Merge remote-tracking branch 'upstream/master'	2014-08-05 12:59:47 +02:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00