[3rd attempt] fixed HOGDescriptor::detectMultiScale() to group weights as well as ROIs
Reverted back to the previous method where a public method groupRectangles was added to HOGDescriptor to take care of ROI and weight grouping
Added spacing in a nested template argument list.
added documentation for OpenGL interoperability
Add super resolution's OpenCL implementation.
Accuracy and performance tests are also provided.
Fix build error.
PvAPI support on Windows with MinGW (PR #1038 applied to the branch 2.4)
add kmeans
Bugfix for an overlapping size of image and template for matchTemplate.

Example: img of size 10x10 and templ of size 11x9.
In subsequent code this will results in either width or height of
corrSize to be zero (0).
Line 261 will call crossCorr which will then have a zero size of either
blocksize.width or blocksize.height resulting in a division by zero
crach in lines 137 or 138.
remove the redundant function
Fixed issue 3130 (http://code.opencv.org/issues/3130), where one argument of the BRISK-call was ignored. Previously it was not possible to use BRISK without creating descriptors.
Now it behaves like ORB (and how it is documented), and you can call BRISK to just generate feature points and no descriptors.
fix the function name
Improve FPS on black and white Ximea cameras
fixing working with test data and a small fix for init code
- set init value for `numsdev` to prevent use of uninitialized value
- stop use of 'workdir' and files from samples
- forcing use of 'opencv_extra' instead
Note: set OPENCV_TEST_DATA_PATH to full path to 'opencv_extra/testdata' (gitolite@code.opencv.org:opencv_extra.git) before running the test!
Merge pull request #1097 from apavlenko:ocl_tests_fixes
V4L and V4L2 based Video capture bug fix (Bugfix #3144).
Merge pull request #1099 from asmorkalov:linux_vcap_fix
Fix ocl gftt file name typo.
Add IPP support to integral function
xls-report.py: add ability to specify arbitrary sheet properties