Roman Donchenko dd817857b4 Replaced most of the instances of "s = s +" with "s +=". ...

This resynchronizes master code with 2.4. I say "most", because I might
have missed some due to different spacing; I'll deal with those
instances later if I find them.

2013-11-22 17:59:56 +04:00

..

doc

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-19 16:21:09 +04:00

include/opencv2

Merge pull request #1824 from vpisarev:ocl_experiments5

2013-11-20 19:14:40 +04:00

perf

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-19 16:21:09 +04:00

src

Replaced most of the instances of "s = s +" with "s +=".

2013-11-22 17:59:56 +04:00

test

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-19 16:21:09 +04:00

CMakeLists.txt

ocl: force to use Khronos OpenCL headers

2013-10-18 15:47:11 +04:00