Roman Donchenko 920fd48228 Merge remote-tracking branch 'origin/master' into merge-2.4 ...

Conflicts:
	modules/ocl/src/arithm.cpp

2013-11-26 15:32:44 +04:00

..

core

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

2013-11-26 15:32:44 +04:00

core.hpp

updated patch to bring in the first functions with "transparent API"

2013-11-18 11:48:00 -05:00