Roman Donchenko 6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst modules/features2d/doc/object_categorization.rst modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst modules/gpu/doc/image_filtering.rst modules/gpu/doc/image_processing.rst modules/gpu/doc/video.rst modules/imgproc/doc/miscellaneous_transformations.rst modules/imgproc/doc/object_detection.rst modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst modules/imgproc/src/samplers.cpp modules/ml/doc/k_nearest_neighbors.rst modules/nonfree/doc/feature_detection.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/photo/doc/inpainting.rst modules/ts/include/opencv2/ts.hpp platforms/scripts/camera_build.conf samples/android/camera-calibration/AndroidManifest.xml		2013-08-13 12:56:39 +04:00
..
test_arithm.cpp	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
test_countnonzero.cpp	Normalize line endings and whitespace	2012-10-17 15:32:23 +04:00
test_ds.cpp	fixed #2297, #2300; fixed several warnings	2012-08-28 13:45:35 +04:00
test_dxt.cpp	fixed Core_MulSpectrums failure	2013-02-25 22:02:24 +04:00
test_eigen.cpp	Cleanup core module API	2013-04-09 13:36:32 +04:00
test_io.cpp	Merge branch '2.4'	2013-04-12 15:35:38 +04:00
test_main.cpp	Warning and review notes fixes.	2013-08-02 04:10:56 -07:00
test_mat.cpp	Finalize core headers reorganization	2013-04-03 14:10:03 +04:00
test_math.cpp	Move cv::Mat out of core.hpp	2013-04-01 15:24:34 +04:00
test_misc.cpp	Added a test that documents that negative numbers are not clipped by cv::saturate_cast	2013-02-11 14:58:38 +04:00
test_operations.cpp	Changed / for Matx to Matx::div, for symmetry with Matx::mul.	2013-07-16 12:25:26 +04:00
test_precomp.cpp	fixed compile problems when Makefiles are used	2011-01-11 12:14:31 +00:00
test_precomp.hpp	Move FileStorage to separate header	2013-04-01 19:18:05 +04:00
test_rand.cpp	Backported RNG_MT19937 from master.	2013-04-10 19:39:38 +04:00