bugfix for OpenCL detection with Intel OpenCL SDK 1.2 on linux (Bug #3140)
Changed bad cast in MxArray
access focal length and principal point in camera
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
Merge pull request #1247 from StevenPuttemans:bugfix_3205
Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison

There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.

First contributor of this commit was sperrholz.
Inlined the getMD5 macro, which no longer saves us anything.
Merge pull request #1238 from SpecLad:cmake-min-ver
properly set OpenCL lib search path
Merge pull request #1250 from denzp:opencl_detection_unix
Add OpenCL accelerated implementation for Retina.
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
Fixed CR line endings in non_linear_svms.rst.
Merge https://github.com/Itseez/opencv
Adjusted the camera calibration sample to master API.
Replaced isfinite() with cvIsInf and cvIsNan
Merge pull request #1260 from SpecLad:no-cr-master
Merge pull request #18 from ozantonkal/implementing_camera

Implementing camera
docs changes
docs changes