Merge remote-tracking branch 'origin/master' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 26 Nov 2013 11:32:44 +0000 (15:32 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 26 Nov 2013 11:32:44 +0000 (15:32 +0400)
commit920fd48228edb6adf7d79f1357db32a145d1ee42
treee2d6c3abd40a0d0a439b791045ac91edb671be42
parent9c2272d5204dad63777c7ba053e709b5073c4172
parentaaf97c454848178857833075d996e6d56fa7d926
Merge remote-tracking branch 'origin/master' into merge-2.4

Conflicts:
modules/ocl/src/arithm.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/imgproc.cpp