increase epsilon for GEMM & Convolve sanity tests for CUDA 5.5
Fix building the iOS framework after I dropped the VERSION macro.

This version uses CMake to generate Info.plist, which should be more
reliable than the old approach.
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.
Add OpenCL accelerated implementation for Retina.
Merge pull request #3 from Itseez/2.4

OpenCV changes
fixed gpu cvtColor for BGR <-> YUV
Merge pull request #1293 from jet47:gpu-cvtcolor-fix
Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch.
Typo in Java generator fixed.

Typo breaks debug build for Android platform.
Merge pull request #1301 from asmorkalov:java_video_capture_fix
Fix the name of perf tests' precompiled header.

(cherry picked from commit aa96d8d053c3d0c367da7c1c1f9c73ed376b3bfa)
fixed gpu bitwize operation:

incorrect types for template instantiation
Fix build error when WITH_OPENCL is disabled.
Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros
record cuda gpu name to output report
Fix build error on Mac
Merge pull request #1314 from jet47:ts-gpu-fix
Add IPP 8.0 support in FindIPP script
Merge pull request #1215 from jet47:cuda-5.5-sanity