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
..
opencv2	Merge remote-tracking branch 'origin/master' into merge-2.4	2013-11-26 15:32:44 +04:00