Roman Donchenko 799d2dabd6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/core/test/test_arithm.cpp
	modules/cuda/src/cascadeclassifier.cpp
	modules/imgproc/doc/geometric_transformations.rst
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/moments.cpp

2014-04-14 16:08:02 +04:00

..

viz

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

2014-04-14 16:08:02 +04:00

viz.hpp

modified viz module header layout for 2.4 compatibility

2014-02-02 16:23:34 +04:00