fixed cmd parser when arg is like -+
Fix ocl::calcHarris not support CV_32FC1 bug.
A minor fix.
Fix merge conflicts
Fix the whitespace warning.
Slight modification to example code for FLANN matcher with comment on #3344
Replaced code in .rst file with literalinclude as suggested
Applied fix mentioned in bugreport 3370. Seems to solve the issue.
Added fixes mentioned in bugreport 3306
- Added author provided fixes
- Added code example
- Added documentation fixes
fixed comparison to stop integer wrap around
Image processing sample for WinRT added.
fixed compilation with CUDA 6.0:

GpuMat::setTo function, removed NPP call for CV_8S
enable CUDA support for android
fixed CC arch/pts for android (used sm_32)
fixed compilation warnings in .cu files
added `-Xptxas;-dlcm=ca` and `-target-os-variant=Android` to nvcc flags
fixed CUDA_TOOLKIT_TARGET_DIR for android:

use targets/armv7-linux-androideabi is exists
Filter selection and several filters implemented for WinRT sample.
fixed compilation of gpu-basics-similarity tutorial:

initialize TIMES variable with some default value (10)
Some debug options are removed because they are installed by Cmake automatically.

Also forcing -ggdb3 on android leads to debuging issues.