[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.
JavaCameraView delivers same frame twice (Bug #3123) fixed.
allow QtKit capture in secondary threads

[NSRunLoop currentRunLoop] is not the same as in the main thread.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"

The old code caused grabFrame() to return immediately if the capture
was not done in the main thread.
This code works correctly, even in secondary threads, provided that all
capture functions are called in the *same* thread
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.
GFTT wrapped to python
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.
optimize stereoBP kernel
Fix oclMat constructor when roi is provided.
Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
line realign
xls-report.py: don't eat all errors when reading sheet.conf