Merge commit '0566ab4d3d' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:51:46 +0000 (16:51 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:51:46 +0000 (16:51 +0400)
commit1312eca220430cfbc9d6f1aa7f0e472fc5b84974
tree975f8fff8a6e2cc156a72c393991e3c5b87801c6
parent82e2e6dbc304cd2935052893a53c1e6f0add1d7c
parent0566ab4d3d0da080897bfd0462a22adb01d51397
Merge commit '0566ab4d3d' into merge-2.4

Conflicts:
modules/core/src/system.cpp
modules/core/src/system.cpp
modules/ocl/src/gftt.cpp