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
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
include/opencv2	fix gpu warnings with signed/unsigned char	2013-06-18 17:44:49 +04:00
misc	Fixed the shebang lines on the Python scripts.	2013-04-11 18:37:23 +04:00
perf	compare cv::gpu::calcHist with cv::calcHist	2013-08-01 18:00:05 +04:00
perf4au	Merge remote-tracking branch 'origin/2.4'	2013-08-06 13:56:49 +04:00
src	use NPP version for Fermi	2013-08-02 09:05:21 +04:00
test	optimized version of histEven for CV_8UC1	2013-08-01 18:00:05 +04:00
CMakeLists.txt	fixed build with CUDA 5.5 on arm platforms	2013-06-18 17:46:57 +04:00