Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4 ... Conflicts: modules/photo/doc/inpainting.rst		2013-08-16 14:14:12 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
include/opencv2	removed obsolete API	2013-06-20 11:24:29 +04:00
perf	fixed gpu performance tests:	2013-07-16 15:43:04 +04:00
src	added cudev::GpuMat_<T> support to Input/Output arrays	2013-07-22 10:33:40 +04:00
test	refactored Morphology Filters	2013-06-14 17:25:57 +04:00
CMakeLists.txt	refactored box filter	2013-06-14 17:25:56 +04:00